Author: ronvoe122
Date: 2006-12-28 07:20:15-0800
New Revision: 10400
Modified:
trunk/ (props changed)
trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Log:
Merged revisions 10370-10371 via svnmerge from
http://scarab.tigris.org/svn/scarab/branches/release/b21
........
r10370 | spjames | 2006-11-30 17:27:14 +0100 (Do, 30 Nov 2006) | 4 lines
When the issue list was sorted by an internal attribute (eg creation date),
the issue ID column was ierroneously shown as the current sort column in
addition to the correct internal attribute column.
........
r10371 | spjames | 2006-11-30 18:38:47 +0100 (Do, 30 Nov 2006) | 4 lines
Sorting on issue ID could become broken. The AssignedTo attribute (2) was
used for sorting by default, overriding the 'null' sortColumn used by
IssuesList.vm to mean sort by issue ID.
........
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&rev=10400&p1=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10399&r2=10400
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2006-12-28 07:20:15-0800
@@ -1185,7 +1185,7 @@
/**
* Looks at the current RModuleIssueType and if it is null,
- * returns the users homepage. If it is not null, and is
+ * returns the users home page. If it is not null, and is
* dedupe, returns Wizard1...else Wizard3.
*/
public String getNextEntryTemplate(IssueType issueType)
@@ -1435,8 +1435,8 @@
}
/**
- * Get a list of Issue objects from a list of issue ids. The list
- * can contain Strings or Integers, but all ids must be of the same type
+ * Get a list of Issue objects from a list of issue IDs. The list
+ * can contain Strings or Integers, but all IDs must be of the same type
* (String or Integer).
*
* @param issueIds a <code>List</code> value
@@ -1535,7 +1535,7 @@
/**
* Check whether the current session has an attribute of given key.
* If there is no active session available, throw a scarabException.
- * returns true, if attribute exosts, otherwise returns false.
+ * returns true, if attribute exists, otherwise returns false.
*/
public boolean hasSessionAttribute(String key) throws ScarabException
{
@@ -1836,8 +1836,12 @@
{
search.setSortInternalAttribute(sortInternal);
search.setSortAttributeId(null);
- }
-
+ } else
+ {
+ // Empty the default sort attribute from the search, so that
+ // the issue ID will apply.
+ search.setSortAttributeId(null);
+ }
String sortPolarity = data.getParameters().getString("sortPolarity");
if (sortPolarity != null && sortPolarity.length() > 0)
@@ -1987,7 +1991,7 @@
/**
* Gets the number of results for the current query. Looks first
- * at the URL, then requeries if size information is missing.
+ * at the URL, then re-queries if size information is missing.
*/
public int getCurrentSearchResultsSize()
{
@@ -2622,7 +2626,7 @@
* it returns 1 to avoid returning a value larger than the maximum
* number of pages; otherwise it returns the value of the query parameter
* "pageNum".
- * Preferrable optimization would be to adjust the page number to
+ * Preferable optimization would be to adjust the page number to
* keep a set of the old displayed items on the new page.
*/
public int getAdjustedPageNum()
@@ -2631,7 +2635,7 @@
int resultsPerPage = parameters.getInt("resultsPerPage", 0);
int oldResultsPerPage = parameters.getInt("oldResultsPerPage", 0);
int pageNum = parameters.getInt("pageNum", 1);
- // I seem to be too braindead to come up with a formula to return the
+ // I seem to be too brain dead to come up with a formula to return the
// new page that will contain the first item on the last page we
// viewed.
// forget it and start over
@@ -3256,7 +3260,7 @@
else
{
Log.get().warn("An object of unexpected class was saved as"
- + " the last entered issuetype or template: " +
+ + " the last entered issue type or template: " +
result.getClass().getName());
result = null;
}
@@ -3284,10 +3288,10 @@
}
/**
- * Returned all attributeoptions allowed for every attribute assigned to this
+ * Returned all attribute options allowed for every attribute assigned to this
* RModuleIssueType.
* @param rmit
- * @return List with all the attributeoptions of every attribute.
+ * @return List with all the attribute options of every attribute.
* @throws Exception
*/
public List getSortedAttributeOptionsForRMIT(RModuleIssueType rmit) throws Exception
@@ -3356,7 +3360,7 @@
* <li>PASSTHROUGH or " | " </li>
* </ul>
*
- * A matrix-The may contain nullpointers if there is neither an
+ * A matrix-The may contain null pointers if there is neither an
* OptionValue nor an OptionConnector associated to the cell. This
* can be seen best in an example (V* denotes OptionValues):
* <p><pre>
@@ -3365,7 +3369,7 @@
* [ ][ ][ ][ | ][ ][ +-][V6]
* [ ][ ][ ][ +-][V7][ ][ ]
* </pre></p>
- * If you remove the [] brackets, you should get the idea immedately:
+ * If you remove the [] brackets, you should get the idea immediately:
* <p><pre>
* V1---V2-+-V3-+-V4
* | |-V5
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=10400&p1=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&r1=10399&r2=10400
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm 2006-12-28 07:20:15-0800
@@ -128,7 +128,7 @@
<th>
## Issue ID column
#prepIssueListPageLink()
- #if (!$sortColumn || $sortColumn == 'null' && !$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', 'null').addPathInfo('searchType', $searchType).addPathInfo("resultsPerPage","$resultsPerPage"))
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.