[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms AddUserToGroupInitAction.java SearchConditionalGroupAction.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory 
james.mmbase.org:/tmp/cvs-serv13893/community/src/java/com/finalist/cmsc/community/forms

Modified Files:
      Tag: b1_5
        AddUserToGroupInitAction.java 
        SearchConditionalGroupAction.java 
Log Message:
CMSC-1284 - Community: change displaying users of a group


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.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- AddUserToGroupInitAction.java       6 Feb 2009 13:25:59 -0000       1.10.2.1
+++ AddUserToGroupInitAction.java       11 Feb 2009 11:30:40 -0000      1.10.2.2
@@ -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.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- SearchConditionalGroupAction.java   6 Feb 2009 13:25:59 -0000       1.9.2.1
+++ SearchConditionalGroupAction.java   11 Feb 2009 11:30:40 -0000      1.9.2.2
@@ -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
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs