dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17865
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-01-02 21:12:02 +0100
message:
  Add/edit user group screen. Made the available search function work.
modified:
  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/updateUserGroupForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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	2014-12-28 17:51:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm	2015-01-02 20:12:02 +0000
@@ -1,19 +1,5 @@
 <script type="text/javascript">
-    $( document ).ready( function() {
-        $( '#usersAvailable' ).selected( {
-            url: '../api/users.json',
-            target: $( '#usersSelected' ),
-            search: $( '#usersAvailableSearch' ),
-            iterator: 'users'
-        });
-		
-		$( '#userGroupsAvailable' ).selected( {
-            url: '../api/userGroups.json',
-            target: $( '#userGroupsSelected' ),
-            search: $( '#managedGroupsAvailableSearch' ),
-            iterator: 'userGroups'
-        });
-
+    $( document ).ready( function() {    
         validation2( 'addUserGroupForm', function( form ) {
             form.submit();
         }, {
@@ -26,9 +12,21 @@
         } );
 		
 		checkValueIsExist("name", "validateUserGroup.action");
+		
+        $( '#usersAvailable' ).selected( {
+            url: '../api/users.json',
+            target: $( '#usersSelected' ),
+            search: $( '#usersAvailableSearch' ),
+            iterator: 'users'
+        });
+		
+		$( '#userGroupsAvailable' ).selected( {
+            url: '../api/userGroups.json',
+            target: $( '#userGroupsSelected' ),
+            search: $( '#userGroupsAvailableSearch' ),
+            iterator: 'userGroups'
+        });
     });
-	
-	 
 </script>
 
 <h3>$i18n.getString( "add_user_group" )</h3>

=== modified file '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/updateUserGroupForm.vm	2015-01-02 19:56:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm	2015-01-02 20:12:02 +0000
@@ -1,25 +1,5 @@
 <script type="text/javascript">
-    $( document ).ready( function() {
-        $( '#usersAvailable' ).selected( {
-            url: '../api/users.json',
-            target: $( '#usersSelected' ),
-            search: $( '#usersAvailableSearch' ),
-            iterator: 'users'
-        });
-
-		$( '#userGroupsAvailable' ).selected( {
-            url: '../api/userGroups.json',
-            target: $( '#userGroupsSelected' ),
-            search: $( '#managedGroupsAvailableSearch' ),
-            iterator: 'userGroups'
-        });
-		
-		$(document).ajaxStop(function() 
-		{
-			var selectedGroup = '$group.uid';
-			$( "#userGroupsAvailable option[value='" + selectedGroup + "']" ).remove();
-		});
-
+    $( document ).ready( function() {    
         validation2( 'editUserGroupForm', function( form ) {
             form.submit();
         }, {
@@ -30,9 +10,23 @@
             },
             'rules': getValidationRules( 'userGroup' )
         } );
+        
 		checkValueIsExist("name", "validateUserGroup.action", { id: userGroupId });
-    });
-	
+        
+        $( '#usersAvailable' ).selected( {
+            url: '../api/users.json',
+            target: $( '#usersSelected' ),
+            search: $( '#usersAvailableSearch' ),
+            iterator: 'users'
+        });
+
+		$( '#userGroupsAvailable' ).selected( {
+            url: '../api/userGroups.json',
+            target: $( '#userGroupsSelected' ),
+            search: $( '#userGroupsAvailableSearch' ),
+            iterator: 'userGroups'
+        });		
+    });	
 </script>
 
 <h3>$i18n.getString( "edit_user_group" )</h3>