Scarab commit: svn commit: r11126 - branches/release/1.0.22/src: java/org/tigris/scarab/om java/org/tigris/scarab/tools webapp/WEB-INF/templates/macros webapp/WEB-INF/templates/reports webapp/WEB-INF/templates/screens
[email protected] Fri, 13 Apr 2012 04:18:53 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-04-13 04:18:52-0700
New Revision: 11126
Modified:
branches/release/1.0.22/src/java/org/tigris/scarab/om/Module.java
branches/release/1.0.22/src/java/org/tigris/scarab/om/ScarabModule.java
branches/release/1.0.22/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
branches/release/1.0.22/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
branches/release/1.0.22/src/webapp/WEB-INF/templates/reports/SelectUsers.vm
branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/AssignIssue.vm
branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/UserList.vm
Log:
FIX - Show confirmed users only in list of module's assignable personnel.
Modified: branches/release/1.0.22/src/java/org/tigris/scarab/om/Module.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/java/org/tigris/scarab/om/Module.java?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/java/org/tigris/scarab/om/Module.java (original)
+++ branches/release/1.0.22/src/java/org/tigris/scarab/om/Module.java 2012-04-13 04:18:52-0700
@@ -140,6 +140,23 @@
String sortColumn, String sortPolarity,
boolean includeCommitters)
throws TorqueException,DataSetException;
+
+ /**
+ * Gets users for a given criteria, starting at a particular offset,
+ * for a given length, and have at least one permission that is
+ * applicable to user attributes active in the given issue type.
+ * This method handles the case where limiting the result size
+ * is best accomplished by limiting the database transaction
+ * size, and not postfiltering the list. This is extremely helpful
+ * with large user datasets.
+ */
+ ScarabPaginatedList getUsers(String name, String username,
+ MITList mitList,
+ int offset, int resultSize,
+ String sortColumn, String sortPolarity,
+ boolean includeCommitters,
+ boolean confirmedOnly)
+ throws TorqueException,DataSetException;
/**
* This method is only used by the Turbine Group interface.
Modified: branches/release/1.0.22/src/java/org/tigris/scarab/om/ScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/java/org/tigris/scarab/om/ScarabModule.java?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/java/org/tigris/scarab/om/ScarabModule.java (original)
+++ branches/release/1.0.22/src/java/org/tigris/scarab/om/ScarabModule.java 2012-04-13 04:18:52-0700
@@ -373,6 +373,25 @@
final boolean includeCommitters)
throws TorqueException, DataSetException
{
+ return getUsers(name, username, mitList, pageNum, resultsPerPage, sortColumn, sortPolarity, includeCommitters, false);
+
+ }
+
+ /**
+ * @see org.tigris.scarab.om.Module#getUsers(String, String, String, String, IssueType)
+ * @param mitList MITs to restrict the user's search. If null, it will not be restricted.
+ */
+ public ScarabPaginatedList getUsers(final String name,
+ final String username,
+ final MITList mitList,
+ final int pageNum,
+ final int resultsPerPage,
+ final String sortColumn,
+ final String sortPolarity,
+ final boolean includeCommitters,
+ final boolean confirmedOnly)
+ throws TorqueException, DataSetException
+ {
final int polarity = sortPolarity.equals("asc") ? 1 : -1;
List result = null;
ScarabPaginatedList paginated = null;
@@ -425,6 +444,7 @@
critCount.addJoin(TurbineUserGroupRolePeer.ROLE_ID, TurbineRolePermissionPeer.ROLE_ID);
critCount.addJoin(TurbineRolePermissionPeer.PERMISSION_ID, TurbinePermissionPeer.PERMISSION_ID);
+ //user by name
if (name != null)
{
int nameSeparator = name.indexOf(" ");
@@ -480,6 +500,12 @@
crit.addDescendingOrderByColumn(col);
}
+ //confirmed users only
+ if(confirmedOnly){
+ crit.add(ScarabUserImplPeer.CONFIRM_VALUE, (Object)"CONFIRMED", Criteria.EQUAL);
+ }
+
+ //finish query
final int totalResultSize = ScarabUserImplPeer.getUsersCount(critCount);
crit.setOffset((pageNum - 1)* resultsPerPage);
Modified: branches/release/1.0.22/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ branches/release/1.0.22/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2012-04-13 04:18:52-0700
@@ -2237,12 +2237,13 @@
int resultsPerPage,
String sortColumn,
String sortPolarity,
- boolean includeCommitters)
+ boolean includeCommitters,
+ boolean confirmedOnly)
throws Exception
{
return userFilteredSearchResults(mitList, pageNum, resultsPerPage,
sortColumn, sortPolarity, "", "",
- includeCommitters);
+ includeCommitters, confirmedOnly);
}
/**
@@ -2251,7 +2252,7 @@
*/
public ScarabPaginatedList getUserFilteredSearchResults(MITList mitList,
int pageNum, int resultsPerPage, String sortColumn,
- String sortPolarity, boolean includeCommitters)
+ String sortPolarity, boolean includeCommitters, boolean confirmedOnly)
throws Exception
{
String searchString = data.getParameters()
@@ -2267,7 +2268,7 @@
return userFilteredSearchResults(mitList, pageNum, resultsPerPage,
sortColumn, sortPolarity,
- searchString, searchField, includeCommitters);
+ searchString, searchField, includeCommitters, confirmedOnly);
}
@@ -2278,7 +2279,7 @@
String sortPolarity,
String searchString,
String searchField,
- boolean includeCommitters)
+ boolean includeCommitters, boolean confirmedOnly)
throws Exception
{
ScarabPaginatedList list = null;
@@ -2299,7 +2300,7 @@
list = getCurrentModule().getUsers(name, userName, mitList,
pageNum, resultsPerPage,
sortColumn, sortPolarity,
- includeCommitters);
+ includeCommitters, confirmedOnly);
}
catch (Exception e)
{
Modified: branches/release/1.0.22/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm (original)
+++ branches/release/1.0.22/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm 2012-04-13 04:18:52-0700
@@ -817,7 +817,7 @@
#end
-#macro (userList $mitList $includeAny $includeCommittedBy $parameters $activeOnly)
+#macro (userList $mitList $includeAny $includeCommittedBy $parameters $activeOnly $confirmedOnly)
#set ($userAttrs = $mitList.getCommonUserAttributes($activeOnly))
#set ($modules = $mitList.Modules)
@@ -848,13 +848,13 @@
</div>
#if ($searchString && $searchString.length() > 0)
- #set ($searchResults = $scarabR.getUserFilteredSearchResults($mitList, $pageNum, $resultsPerPage, $sortColumn, $sortPolarity, $includeCommittedBy))
+ #set ($searchResults = $scarabR.getUserFilteredSearchResults($mitList, $pageNum, $resultsPerPage, $sortColumn, $sortPolarity, $includeCommittedBy, $confirmedOnly))
#if ( $searchResults.getList().isEmpty())
<p class="infomark"><em>$l10n.NoUsersMatch</em></p>
- #set ($searchResults = $scarabR.getUserSearchResults($mitList, $pageNum, $resultsPerPage, $sortColumn, $sortPolarity, $includeCommittedBy))
+ #set ($searchResults = $scarabR.getUserSearchResults($mitList, $pageNum, $resultsPerPage, $sortColumn, $sortPolarity, $includeCommittedBy, $confirmedOnly))
#end
#else
- #set ($searchResults = $scarabR.getUserSearchResults($mitList, $pageNum, $resultsPerPage, $sortColumn, $sortPolarity, $includeCommittedBy))
+ #set ($searchResults = $scarabR.getUserSearchResults($mitList, $pageNum, $resultsPerPage, $sortColumn, $sortPolarity, $includeCommittedBy, $confirmedOnly))
#end
#set ($searchResultsSize = $searchResults.getTotalListSize())
Modified: branches/release/1.0.22/src/webapp/WEB-INF/templates/reports/SelectUsers.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/webapp/WEB-INF/templates/reports/SelectUsers.vm?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/webapp/WEB-INF/templates/reports/SelectUsers.vm (original)
+++ branches/release/1.0.22/src/webapp/WEB-INF/templates/reports/SelectUsers.vm 2012-04-13 04:18:52-0700
@@ -56,7 +56,8 @@
#set ($param = ["headingtype", "1"])
#set($booldummy = $parameters.add($param))
-#userList($mitList false false $parameters false)
+
+#userList($mitList false false $parameters false false)
<div class="functnbar3">
<input type="submit" name="eventSubmit_doAddusers" value="$l10n.AddAssignee" />
Modified: branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/AssignIssue.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/AssignIssue.vm?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/AssignIssue.vm (original)
+++ branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/AssignIssue.vm 2012-04-13 04:18:52-0700
@@ -159,7 +159,7 @@
</select>
</div>
-#userList($mitList false false $parameters true)
+#userList($mitList false false $parameters true true)
<div class="functnbar3">
<input type="submit" name="eventSubmit_doAdd" value="$l10n.AddAssignee" />
</div>
Modified: branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/UserList.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/UserList.vm?view=diff&pathrev=11126&r1=11125&r2=11126
==============================================================================
--- branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/UserList.vm (original)
+++ branches/release/1.0.22/src/webapp/WEB-INF/templates/screens/UserList.vm 2012-04-13 04:18:52-0700
@@ -102,7 +102,7 @@
</div>
#end
-#userList($mitList true true $parameters false)
+#userList($mitList true true $parameters false true)
<div class="functnbar3">
<input type="submit" name="eventSubmit_doAddusers" value="$l10n.AddAssignee" />
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2948002