dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3395
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 13:31:42 +0200
message:
  fixed bugs in updateUser
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.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/javascript/updateUserForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js	2011-04-11 09:51:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateUserForm.js	2011-04-15 11:31:42 +0000
@@ -1,17 +1,23 @@
-jQuery( document ).ready( function()
+jQuery(document).ready(function()
 {
-	validation2( 'updateUserForm', function( form )
-	{
-		form.submit()
-	}, {
-		'beforeValidateHandler' : function()
-		{
-			listValidator( 'roleValidator', 'selectedList' );
-		},
-		'rules' : getValidationRules("user")
-	} );
-
-	jQuery("#cancel").click(function() {
-		referrerBack( "alluser.action" );
-	});		
-} );
+    var rules = getValidationRules("user");
+    rules["rawPassword"].required = false;
+    rules["retypePassword"].required = false;
+
+    validation2('updateUserForm', function( form )
+    {
+        form.submit()
+    },
+    {
+        'beforeValidateHandler' : function()
+        {
+            listValidator('roleValidator', 'selectedList');
+        },
+        'rules' : rules
+    });
+
+    jQuery("#cancel").click(function()
+    {
+        referrerBack("alluser.action");
+    });
+});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2011-03-24 13:32:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2011-04-15 11:31:42 +0000
@@ -79,7 +79,7 @@
 	<tr>
         <td><label for="selectionTree">$i18n.getString( "organisation_unit" )</label></td>
 		<td colspan="3">
-			#organisationUnitSelectionTree( false, true, true )
+			#organisationUnitSelectionTree( false, true, false )
 		</td>
 	</tr>
 	<tr>