Scarab commit: svn commit: r10329 - branches/release/b21/src/webapp/WEB-INF/templates: layouts screens/admin

Author: dabbous
Date: 2006-11-05 23:04:16-0800
New Revision: 10329

Modified:
   branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm
   branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm

Log:
cleaned up some velocity messages, mainly null pointer problems

Modified: branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&rev=10329&p1=branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm&r1=10328&r2=10329
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/layouts/Default.vm	2006-11-05 23:04:16-0800
@@ -329,7 +329,7 @@
      <div align="right">
       <div>
        #if ($data.User.isUserAnonymous())
-         #if ($currentIssueId.length()>0)
+         #if ($currentIssueId && ($currentIssueId.length()>0) )
            $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Login").setPathInfo("viewIssueId", $currentIssueId)
          #else
            $link.omitModule().setPage("Login.vm").setAction("Logout").setLabel("$l10n.Login")

Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm?view=diff&rev=10329&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm&r1=10328&r2=10329
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm	2006-11-05 23:04:16-0800
@@ -3,11 +3,14 @@
 
 #set ($sortColumn = $data.Parameters.getString("sortColumn",""))
 #set ($sortPolarity = $data.Parameters.getString("sortPolarity",""))
-#if (!$sortColumn || $sortColumn.length() == 0)
+
+
+
+#if (!$sortColumn || ($sortColumn.length() == 0))
    #set ($sortColumn = "name")
 #end
 
-#if (!$sortPolarity || $sortPolarity.length() == 0)
+#if (!$sortPolarity || ($sortPolarity.length() == 0))
    #set ($sortPolarity = "asc")
 #end
 
@@ -16,7 +19,7 @@
 #set ($searchString = $data.Parameters.getString("searchString" , ""))
 #set ($searchField = $data.Parameters.getString("searchField" , ""))
 
-#if ($searchString && $searchString.length() > 0)
+#if ($searchString && ($searchString.length() > 0))
    #set ($attributes = $scarabR.AttributeSearchResults) 
    #if ( $attributes.isEmpty())
       <p class="infomark"><em>$l10n.NoAttributesMatch</em></p>