dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15950
committer: jimgrace@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-07-03 08:48:31 +0300
message:
  Undo r15669 changes to addUserForm.vm and updateUserForm.vm
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm
  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/addUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm	2014-06-17 13:09:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm	2014-07-03 05:48:31 +0000
@@ -44,10 +44,10 @@
     });
     
     $('#dcAvailable').selected({
-      url: '../api/categoryOptionGroupSets.json',
+      url: '../api/dimensions/constraints.json',
       target: $('#dcSelected'),
       search: $('#dcAvailableSearch'),
-      iterator: 'categoryOptionGroupSets'
+      iterator: 'dimensions'
     });
   });
 </script>
@@ -84,12 +84,12 @@
 
     <tr class="invite" style="display:none">
         <td><label for="inviteEmail">$i18n.getString( "email" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td colspan="3"><input type="text" id="inviteEmail" name="inviteEmail" value="validEmail@xxxxxxxxxx"></td>
+        <td colspan="3"><input type="text" id="inviteEmail" name="inviteEmail" value="validEmail@xxxxxxxxxx" autocomplete="off"></td>
     </tr>
 
     <tr class="invite" style="display:none">
         <td><label for="inviteUsername">$i18n.getString( "username" )</label></td>
-        <td colspan="3"><input type="text" id="inviteUsername" name="inviteUsername"></td>
+        <td colspan="3"><input type="text" id="inviteUsername" name="inviteUsername" autocomplete="off"></td>
     </tr>
 
     <tr class="account">

=== 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	2014-06-17 13:09:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2014-07-03 05:48:31 +0000
@@ -52,10 +52,10 @@
     });
     
     $('#dcAvailable').selected({
-      url: '../api/categoryOptionGroupSets.json',
+      url: '../api/dimensions/constraints.json',
       target: $('#dcSelected'),
       search: $('#dcAvailableSearch'),
-      iterator: 'categoryOptionGroupSets'
+      iterator: 'dimensions'
     });
   });
 </script>
@@ -193,7 +193,7 @@
     "prefix": "dc",
     "i18n_available": "available_dimension_restrictions_for_data_analytics",
     "i18n_selected": "selected_dimension_restrictions_for_data_analytics",
-    "objects": $userCredentials.cogsDimensionConstraints
+    "objects": $userCredentials.dimensionConstraints
 })
 
 <div id="showFewerOptions" style="margin-bottom: 20px;"><a href="javascript:showUserOptions()">$i18n.getString( "show_fewer_options" )</a></div>