Author: ronvoe122
Date: 2006-12-28 07:10:06-0800
New Revision: 10398
Modified:
trunk/ (props changed)
trunk/src/java/org/tigris/scarab/actions/Search.java
trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Log:
Merged revisions 10365 via svnmerge from
http://scarab.tigris.org/svn/scarab/branches/release/b21
........
r10365 | spjames | 2006-11-29 14:30:27 +0100 (Mi, 29 Nov 2006) | 1 line
Resolve SCB1836: (Sorting on issues list resets to 25 rows)
........
Modified: trunk/src/java/org/tigris/scarab/actions/Search.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/Search.java?view=diff&rev=10398&p1=trunk/src/java/org/tigris/scarab/actions/Search.java&p2=trunk/src/java/org/tigris/scarab/actions/Search.java&r1=10397&r2=10398
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/Search.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/Search.java 2006-12-28 07:10:06-0800
@@ -751,7 +751,7 @@
+ "&searchallattributes=true";
final String queryEnd = "&searchsctoi=0"
- + "&resultsperpage=25"
+ + "&resultsperpage=" + ScarabConstants.ISSUE_MAX_VIEW
+ "&searchscfoi=0";
query = queryStart;
query += queryPart;
Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&rev=10398&p1=trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm&p2=trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm&r1=10397&r2=10398
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm 2006-12-28 07:10:06-0800
@@ -554,7 +554,11 @@
</p>
#end
+## Writes the pagination links for an issue list: "<< Pervious | n of N | Next >>"
#macro (paginateIssueList $resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)
+ #if (!$sortColumn)
+ #set ($sortColumn='null')
+ #end
<p class="paginate">
#if($scarabR.PrevPage != 0)
#set ($prevLink = $link.setPathInfo("resultsperpage", "$resultsPerPage").setPathInfo("pageNum", "$scarabR.PrevPage").setPathInfo("sortColumn", "$sortColumn").setPathInfo("sortPolarity", "$sortPolarity").setPathInfo("searchType", "$searchType").setPage($scarabR.getCurrentTemplate()))
Modified: trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm?view=diff&rev=10398&p1=trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&p2=trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&r1=10397&r2=10398
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/macros/MITListMacro.vm 2006-12-28 07:10:06-0800
@@ -352,10 +352,10 @@
## keep track of state of the list, resultsPerPage should come after the
## chance to change it, because we will use the first value
-<input type="hidden" name="sortColumn" value="$sortColumn" />
-<input type="hidden" name="sortPolarity" value="$sortPolarity" />
-<input type="hidden" name="pageNum" value="$pageNum" />
-<input type="hidden" name="resultsPerPage" value="$resultsPerPage" />
+#if ($sortColumn) <input type="hidden" name="sortColumn" value="$sortColumn" /> #end
+#if ($sortPolarity) <input type="hidden" name="sortPolarity" value="$sortPolarity" /> #end
+#if ($pageNum) <input type="hidden" name="pageNum" value="$pageNum" /> #end
+#if ($resultsPerPage) <input type="hidden" name="resultsPerPage" value="$resultsPerPage" /> #end
#end
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=10398&p1=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&r1=10397&r2=10398
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm 2006-12-28 07:10:06-0800
@@ -14,7 +14,7 @@
#set ($totalCount = $issueListSize)
## if results exceed limit, get subset list
-#set ($resultsPerPage = $data.Parameters.getInt('resultsPerPage', 25))
+#set ($resultsPerPage = $data.Parameters.getInt('resultsPerPage', $scarabG.Constant.ISSUE_MAX_VIEW))
#set ($pageNum = $data.Parameters.getInt('pageNum', 1))
#set ($paginated = $resultsPerPage > 0 && $issueListSize > $resultsPerPage)
#if ($paginated)
@@ -54,9 +54,11 @@
#end
#if ($issueListSize == 0)
+ ## There are no matching issues
<h3>$page.Title</h3>
<p><em>$l10n.NoMatchingIssues</em></p>
#else
+## START OF ISSUES LIST
<form action="$link.setPage('IssueList.vm').setAction('Search')" method="post">
#if ($searchType)
<input type="hidden" name="searchType" value="$searchType" />
@@ -99,7 +101,7 @@
<input type="hidden" name="sortPolarity" value="$sortPolarity" />
#end
-## PAGINATION
+## PAGINATION NAVIGATION LINKS
#if ($paginated)
#paginateIssueList($resultsPerPage $pageNum $sortColumn $sortPolarity $searchType)
#end
@@ -124,17 +126,20 @@
<th>$l10n.IssueType</th>
#end
<th>
+ ## Issue ID column
#prepIssueListPageLink()
- #if (!$sortColumn && !$sortInternal )
+ #if (!$sortColumn || $sortColumn == 'null' && !$sortInternal)
+ ## No sorting column is active, use issue ID
#if ($sortPolarity.equals('desc'))
- #set ($arrowLink = $link.setPathInfo('sortPolarity', 'asc').addPathInfo('sortColumn', '').addPathInfo('searchType', $searchType))
+ #set ($arrowLink = $link.setPathInfo('sortPolarity', 'asc').addPathInfo('sortColumn', 'null').addPathInfo('searchType', $searchType).addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$arrowLink"><img src="$staticLink.setPath('/images/icon_downarrow_on.gif')" width="13" height="8" alt="$l10n.SortDescending" title="$l10n.SortDescending" border="0" />$l10n.IssueId</a>
#else
- #set ($arrowLink = $link.setPathInfo("sortPolarity", "desc").addPathInfo("sortColumn", "").addPathInfo("searchType","$searchType"))
+ #set ($arrowLink = $link.setPathInfo("sortPolarity", "desc").addPathInfo("sortColumn", 'null').addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$arrowLink"><img src="$staticLink.setPath("/images/icon_uparrow_on.gif")" width="13" height="8" alt="$l10n.SortAscending" title="$l10n.SortAscending" border="0" />$l10n.IssueId</a>
#end
#else
- #set ($sortLink = $link.setPathInfo("sortColumn","").setPathInfo("sortPolarity", $sortPolarity).addPathInfo("searchType","$searchType"))
+ ## Issue ID column is not the one we are sorting on
+ #set ($sortLink = $link.setPathInfo("sortColumn", 'null').setPathInfo("sortPolarity", $sortPolarity).addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$sortLink">$l10n.IssueId</a>
#end
</th>
@@ -161,27 +166,28 @@
<th>
#prepIssueListPageLink()
#if ($sortColumn.equals($pref.AttributeId.toString()) || $sortInternal.equals($pref.Name))
+ ## This column is the one we are currently sorting on
#if ($sortPolarity.equals("desc"))
- #set ($arrowLink = $link.setPathInfo("sortPolarity", "asc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType"))
+ #set ($arrowLink = $link.setPathInfo("sortPolarity", "asc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$arrowLink"><img src="$staticLink.setPath("/images/icon_downarrow_on.gif")" width="13" height="8" alt="$l10n.SortDescending" title="$l10n.SortDescending" border="0" /></a>
#prepIssueListPageLink()
- #set ($arrowLink = $link.setPathInfo("sortPolarity", "asc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType"))
+ #set ($arrowLink = $link.setPathInfo("sortPolarity", "asc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$arrowLink">$value</a>
#else
- #set ($arrowLink = $link.setPathInfo("sortPolarity", "desc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType"))
+ #set ($arrowLink = $link.setPathInfo("sortPolarity", "desc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$arrowLink"><img src="$staticLink.setPath("/images/icon_uparrow_on.gif")" width="13" height="8" alt="$l10n.SortAscending" title="$l10n.SortAscending" border="0" /></a>
#prepIssueListPageLink()
- #set ($arrowLink = $link.setPathInfo("sortPolarity", "asc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType"))
+ #set ($arrowLink = $link.setPathInfo("sortPolarity", "desc").setPathInfo($sort, "$sortData").addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$arrowLink">$value</a>
#end
#else
- #set ($sortLink = $link.setPathInfo($sort, "$sortData").setPathInfo("sortPolarity", "$sortPolarity").addPathInfo("searchType","$searchType"))
+ #set ($sortLink = $link.setPathInfo($sort, "$sortData").setPathInfo("sortPolarity", "$sortPolarity").addPathInfo("searchType","$searchType").addPathInfo("resultsPerPage","$resultsPerPage"))
<a href="$sortLink">$value</a>
#end
</th>
- #end
+ #end ##foreach ($pref in $scarabR.RModuleUserAttributes)
</tr> <!-- END of HEADER -->
<tr> <!-- DATA -->
#foreach ($record in $qrIterator)
@@ -216,7 +222,7 @@
#end
</td>
#end
- #end <!- END DATA -->
+ #end <!- END DATA --> ## foreach ($record in $qrIterator)
</tr>
</table>
## END of RESULTS TABLE!
Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm?view=diff&rev=10398&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10397&r2=10398
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm 2006-12-28 07:10:06-0800
@@ -39,10 +39,11 @@
<div class="axial">
#foreach ($group in $issueType.getAttributeGroups($module, true))
- #if (!$group.Attributes.isEmpty())
+ #set ($attributes = $group.Attributes)
+ #if ($attributes && !$attributes.isEmpty())
<h4>$group.Name #asterisk()</h4>
<table cellpadding="3" cellspacing="2" border="0" width="100%">
- #foreach ($att in $group.Attributes)
+ #foreach ($att in $attributes)
#set ($rma = $module.getRModuleAttribute($att, $issueType))
#if ($rma.Active)
#set ($attVal = $attrValues.get($att.getName().toUpperCase()))
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.