=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm 2013-03-16 05:57:01 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm 2013-03-20 21:43:25 +0000 @@ -6,6 +6,8 @@ }, { 'beforeValidateHandler' : function() { + jQuery( "#groupMembersList" ).find( "option" ).attr( "selected", "selected" ); + #tblDynamicAttributesJavascript() }, 'rules' : getValidationRules( "userGroup" ) === removed file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/userGroupList.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/userGroupList.js 2013-03-12 09:27:40 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/userGroupList.js 1970-01-01 00:00:00 +0000 @@ -1,20 +0,0 @@ - -// ----------------------------------------------------------------------------- -// Usergroup functionality -// ----------------------------------------------------------------------------- - -function showUserGroupDetails( userGroupId ) -{ - jQuery.post( 'getUserGroup.action', { userGroupId: userGroupId }, - function ( json ) { - setInnerHTML( 'nameField', json.userGroup.name ); - setInnerHTML( 'noOfGroupField', json.userGroup.noOfUsers ); - - showDetails(); - }); -} - -function removeUserGroup( userGroupId, userGroupName ) -{ - removeItem( userGroupId, userGroupName, i18n_confirm_delete, 'removeUserGroup.action' ); -} === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm 2013-03-14 10:53:15 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm 2013-03-20 21:43:25 +0000 @@ -6,6 +6,8 @@ }, { 'beforeValidateHandler' : function() { + jQuery( "#groupMembersList" ).find( "option" ).attr( "selected", "selected" ); + #tblDynamicAttributesJavascript(); }, 'rules' : getValidationRules( "userGroup" )