=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java 2010-05-10 17:50:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java 2010-12-29 20:53:30 +0000 @@ -1,9 +1,31 @@ +package org.hisp.dhis.user.action; + /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hisp.dhis.user.action; - import com.opensymphony.xwork2.Action; import java.util.Collection; @@ -16,13 +38,9 @@ import org.hisp.dhis.user.UserSetting; import org.hisp.dhis.user.UserStore; -/** - * - * @author Administrator - */ -public class DeleteCurrentUserAction implements Action +public class DeleteCurrentUserAction + implements Action { - private UserStore userStore; public void setUserStore( UserStore userStore ) @@ -111,8 +129,9 @@ { return INPUT; } - //System.out.println( "oldPasswordFromDB = " + oldPasswordFromDB + " encoded old password = " + passwordManager.encodePassword( userCredentials.getUsername(), oldPassword ) ); + String oldEncodedPassword = passwordManager.encodePassword( userCredentials.getUsername(), oldPassword ) ; + if ( !oldEncodedPassword.equals( oldPasswordFromDB ) ) { message = i18n.getString( "wrong_password" ); @@ -131,12 +150,12 @@ { message = i18n.getString( "can_not_remove_last_super_user" ); return INPUT; - } else + } + else { userStore.deleteUserCredentials( userStore.getUserCredentials( user ) ); userStore.deleteUser( user ); } - return "logout"; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/EditUserGroupFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/EditUserGroupFormAction.java 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/EditUserGroupFormAction.java 2010-12-29 20:53:30 +0000 @@ -1,5 +1,32 @@ package org.hisp.dhis.user.action; +/* + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import java.util.ArrayList; import java.util.List; @@ -13,7 +40,6 @@ public class EditUserGroupFormAction implements Action { - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- @@ -42,7 +68,7 @@ { this.userGroupId = userGroupId; } - + public Integer getUserGroupId() { return userGroupId; @@ -60,35 +86,30 @@ public List getGroupMembers() { return groupMembers; - - } - - - private UserGroup group ; - - public UserGroup getGroup() - { - return group; - } - - + } + + private UserGroup group; + + public UserGroup getGroup() + { + return group; + } + // ------------------------------------------------------------------------- // Action Implementation // ------------------------------------------------------------------------- - public String execute() throws Exception { - availableUsers = new ArrayList( userStore.getAllUsers() ); group = userGroupService.getUserGroup( userGroupId ); - + groupMembers = new ArrayList( group.getMembers() ); - + availableUsers.removeAll( groupMembers ); + return SUCCESS; } - } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java 2010-12-28 17:49:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java 2010-12-29 20:53:30 +0000 @@ -30,9 +30,7 @@ import static org.apache.commons.lang.StringUtils.isNotBlank; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.List; import org.hisp.dhis.organisationunit.OrganisationUnit; @@ -43,8 +41,6 @@ import org.hisp.dhis.user.UserStore; import org.hisp.dhis.user.comparator.UsernameComparator; -import com.opensymphony.xwork2.Action; - /** * @author Torgeir Lorange Ostby * @version $Id: GetOrgunitUserListAction.java 5549 2008-08-20 05:23:35Z abyot $ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupAction.java 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupAction.java 2010-12-29 20:53:30 +0000 @@ -1,26 +1,44 @@ package org.hisp.dhis.user.action; +/* + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupService; import com.opensymphony.xwork2.Action; - - -public class GetUserGroupAction implements Action +public class GetUserGroupAction + implements Action { - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- - // private UserStore userStore; - - //public void setUserStore( UserStore userStore ) - //{ - // this.userStore = userStore; - // } - private UserGroupService userGroupService; public void setUserGroupService( UserGroupService userGroupService ) @@ -28,7 +46,6 @@ this.userGroupService = userGroupService; } - // ------------------------------------------------------------------------- // Input/output // ------------------------------------------------------------------------- @@ -70,12 +87,5 @@ memberCount =group.getMembers().size(); return SUCCESS; - } - - - - - - - + } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupListAction.java 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupListAction.java 2010-12-29 20:53:30 +0000 @@ -1,5 +1,32 @@ package org.hisp.dhis.user.action; +/* + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import java.util.ArrayList; import java.util.List; @@ -11,7 +38,6 @@ public class GetUserGroupListAction implements Action { - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- @@ -41,10 +67,8 @@ public String execute() throws Exception { - userGroupList = new ArrayList( userGroupService.getAllUserGroups() ); return SUCCESS; } - } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java 2010-12-06 14:13:48 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java 2010-12-29 20:53:30 +0000 @@ -101,8 +101,7 @@ public String execute() throws Exception - { - + { if ( isNotBlank( key ) ) // Filter on key only if set { this.paging = createPaging( userStore.getUserCountByName( key ) ); @@ -121,6 +120,7 @@ UserCredentials userCredentials = userStore.getUserCredentials( currentUser ); currentUserName = userCredentials.getUsername(); + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/RemoveUserGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/RemoveUserGroupAction.java 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/RemoveUserGroupAction.java 2010-12-29 20:53:30 +0000 @@ -1,5 +1,32 @@ package org.hisp.dhis.user.action; +/* + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import org.hisp.dhis.common.DeleteNotAllowedException; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.user.UserGroupService; @@ -33,18 +60,16 @@ // ------------------------------------------------------------------------- private Integer id; + public void setId( Integer id ) { this.id = id; } - // ------------------------------------------------------------------------- // Output // ------------------------------------------------------------------------- - - private String message; public String getMessage() @@ -58,9 +83,6 @@ public String execute() { - System.out.println("\n\n ===== \n userGroupService : " + userGroupService); - System.out.println("\n\n userGroupId : " + id); - System.out.println("\n\n userGroupService.getUserGroup( userGroupId ) : " + userGroupService.getUserGroup( id )); try { userGroupService.deleteUserGroup( userGroupService.getUserGroup( id ) ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2010-12-24 15:52:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2010-12-29 20:53:30 +0000 @@ -193,8 +193,8 @@ delete_current_user = Delete Current User number_of_orgunit = Number of organisation units -user_groups = User groups -intro_user_groups = Create user groups for functionality that should work on a group of users, like notifications. +user_group = User Group +intro_user_group = Create user groups for functionality that should work on a group of users, like notifications. user_group_management = User group management filter_by_name = Filter by name edit_user_group = Edit user group === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2010-12-28 17:49:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2010-12-29 20:53:30 +0000 @@ -187,7 +187,7 @@ /main.vm - /dhis-web-maintenance-user/editUserGroupForm.vm + /dhis-web-maintenance-user/updateUserGroupForm.vm /dhis-web-maintenance-user/menu.vm css/receiveImportPage.css === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm 2010-12-29 20:53:30 +0000 @@ -1,25 +1,25 @@

$i18n.getString( "add_user_group" )

- - ## Labels - ## Input - - - - - - - - - + + + + + + + + + + - - - -
$i18n.getString( "user_group_details" )
+
$i18n.getString( "user_group_details" )
-
  
-
  + + + + + @@ -62,30 +62,3 @@

- - - - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm 2010-12-29 20:53:30 +0000 @@ -5,6 +5,6 @@ #introListImgItem( "alluser.action" "user" "user" ) #introListImgItem( "user.action" "user_by_orgunit" "user" ) #introListImgItem( "allRole.action" "user_role" "user" ) - #introListImgItem( "getAllUserGroups.action" "user_groups" "user" ) + #introListImgItem( "getAllUserGroups.action" "user_group" "user" ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm 2010-12-29 20:53:30 +0000 @@ -4,7 +4,6 @@
  • $i18n.getString( "user_by_orgunit" ) 
  • $i18n.getString( "user_role" ) 
  • $i18n.getString( "delete_current_user" )
    • - -
  • $i18n.getString( "user_groups" )
    • +
  • $i18n.getString( "user_group" )
    • \ No newline at end of file === renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/editUserGroupForm.vm' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/editUserGroupForm.vm 2010-12-23 12:27:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm 2010-12-29 20:53:30 +0000 @@ -3,25 +3,23 @@ - -
    $i18n.getString( "available_users" )
    - ## Labels - ## Input + +
    + + - - - - - - - - - - + + + + + + + + + + -
    $i18n.getString( "user_group_details" )
    -
      
    $i18n.getString( "user_group_details" )
    -
      + @@ -51,10 +49,11 @@ @@ -85,13 +84,7 @@ return false ; }else{ if (c >0 ) - { - /* for( k =0;k<=c;k++) - {alert('k : ' + k); - alert('abc.options[k] : ' + abc.options[k]); - abc.options[k].selected = true ; - }*/ - + { selectAllById("groupMembers"); } }
    $i18n.getString( "available_users" ) - #foreach( $user in $groupMembers ) - - #end + + #end +