Scarab commit: svn commit: r10347 - trunk: . src/webapp/WEB-INF/templates/layouts src/webapp/WEB-INF/templates/screens src/webapp/WEB-INF/templates/screens/admin

Author: ronvoe122
Date: 2006-11-08 08:55:55-0800
New Revision: 10347

Modified:
   trunk/   (props changed)
   trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
   trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
   trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm

Log:
Merged revisions 10323-10329 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10323 | dabbous | 2006-11-04 22:04:27 +0100 (Sa, 04 Nov 2006) | 1 line
  
  removed a problem reported in the velocity logs
........
  r10324 | dabbous | 2006-11-05 15:00:46 +0100 (So, 05 Nov 2006) | 1 line
  
  numAttachs can be null, added additional check in GUI
........
  r10329 | dabbous | 2006-11-06 08:04:16 +0100 (Mo, 06 Nov 2006) | 1 line
  
  cleaned up some velocity messages, mainly null pointer problems
........


Modified: trunk/src/webapp/WEB-INF/templates/layouts/Default.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/layouts/Default.vm?view=diff&rev=10347&p1=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&p2=trunk/src/webapp/WEB-INF/templates/layouts/Default.vm&r1=10346&r2=10347
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/layouts/Default.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/layouts/Default.vm	2006-11-08 08:55:55-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: trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&rev=10347&p1=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&r1=10346&r2=10347
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm	2006-11-08 08:55:55-0800
@@ -93,8 +93,13 @@
 #set ($sortColumn = $data.Parameters.getString('sortColumn'))
 #set ($sortInternal=$data.Parameters.getString('sortInternal'))
 #set ($sortPolarity = $data.Parameters.getString('sortPolarity', 'asc'))
-<input type="hidden" name="sortColumn" value="$sortColumn" />
-<input type="hidden" name="sortPolarity" value="$sortPolarity" />
+
+#if ($sortColumn)
+  <input type="hidden" name="sortColumn" value="$sortColumn" />
+#end
+#if ($sortPolarity)
+  <input type="hidden" name="sortPolarity" value="$sortPolarity" />
+#end
 
 ## PAGINATION
 #if ($paginated)
@@ -203,7 +208,9 @@
     #if ($value.length() == 0)
       -------
     #else
-      #if ($scarabR.getAttributeType($velocityCount) == "date")
+      #set ($attributeType = $scarabR.getAttributeType($velocityCount) )
+ 
+      #if ( $attributeType && $attributeType == "date")
         $scarabR.formatDate($value)    
       #else
         $value 

Modified: trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm?view=diff&rev=10347&p1=trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm&r1=10346&r2=10347
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm	2006-11-08 08:55:55-0800
@@ -116,7 +116,7 @@
                 <th>$l10n.format("AttachmentsURLs",$currentIssue.ExistingAttachments.size(), $currentIssue.Urls.size())</th>
               #else
                 #initializeTabLink()
-                <td><a href="$tabLink.addPathInfo("tab", "4")">$l10n.format("AttachmentsURLs", $currentIssue.ExistingAttachments.size(), $currentIssue.Urls.size()) #if ($numAttachs > 0) ($numAttachs) #end</a></td>
+                <td><a href="$tabLink.addPathInfo("tab", "4")">$l10n.format("AttachmentsURLs", $currentIssue.ExistingAttachments.size(), $currentIssue.Urls.size()) #if ( $numAttachs && $numAttachs > 0) ($numAttachs) #end</a></td>
               #end
 
               #if ($tab.equals("5"))

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm?view=diff&rev=10347&p1=trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm&r1=10346&r2=10347
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/GlobalAttributeShow.vm	2006-11-08 08:55:55-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>