Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv8944/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
AddUserToGroupInitAction.java
SearchConditionalGroupAction.java
Log Message:
CMSC-1284(Add a judge, if the amount of the users in one group is large than
10, just show the first 10 users, otherwise show all the users.)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1284
Index: AddUserToGroupInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/AddUserToGroupInitAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- AddUserToGroupInitAction.java 6 Feb 2009 13:26:05 -0000 1.11
+++ AddUserToGroupInitAction.java 11 Feb 2009 09:52:09 -0000 1.12
@@ -73,7 +73,12 @@
StringBuilder userNames = new StringBuilder();
Set <Authentication> authentications =
authority.getAuthentications();
if (!authentications.isEmpty()) {
- for (Authentication au : authentications) {
+ group.setUserAmount(authentications.size());
+
+ Iterator<Authentication> iterator = authentications.iterator();
+ int loopTimes = (authentications.size() > 10)? 10 :
authentications.size();
+ for (int i = 0 ; i < loopTimes; i++) {
+ Authentication au = iterator.next();
Person person =
getPersonService().getPersonByAuthenticationId(au.getId());
if (person != null) {
userNames.append(person.getFullName() + ", ");
@@ -81,6 +86,7 @@
}
group.setUsers(userNames.substring(0, userNames.length() - 2));
} else {
+ group.setUserAmount(0);
group.setUsers("");
}
groupForShow.add(group);
Index: SearchConditionalGroupAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SearchConditionalGroupAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- SearchConditionalGroupAction.java 6 Feb 2009 13:26:05 -0000 1.10
+++ SearchConditionalGroupAction.java 11 Feb 2009 09:52:09 -0000 1.11
@@ -75,14 +75,20 @@
StringBuffer userNames = new StringBuffer();
Set <Authentication> authentications =
authority.getAuthentications();
if (!authentications.isEmpty()) {
- for (Authentication au : authentications) {
+ group.setUserAmount(authentications.size());
+
+ Iterator<Authentication> iterator = authentications.iterator();
+ int loopTimes = (authentications.size() > 10)? 10 :
authentications.size();
+ for (int i = 0 ; i < loopTimes; i++) {
+ Authentication au = iterator.next();
Person person =
getPersonService().getPersonByAuthenticationId(au.getId());
if (person != null) {
- userNames.append(person.getFirstName() + " " +
person.getLastName() + ", ");
+ userNames.append(person.getFullName() + ", ");
}
}
group.setUsers(userNames.substring(0, userNames.length() - 2));
} else {
+ group.setUserAmount(0);
group.setUsers("");
}
groupForShow.add(group);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
