dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15669
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-13 16:08:04 +0800
message:
  Add uid property in the last property in the details area for objects in dhis-web-maintenance-user module.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRole.vm
  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/allRole.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js
  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/user.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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm	2012-11-08 14:13:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm	2014-06-13 08:08:04 +0000
@@ -1,6 +1,7 @@
 { "user":
   {
     "id": ${user.id},
+    "uid": "${user.uid}",
     "surname": "$!encoder.jsonEncode( ${user.surname} )",
     "firstName": "$!encoder.jsonEncode( ${user.firstName} )",
     "username": "$!encoder.jsonEncode( ${user.userCredentials.username} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRole.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRole.vm	2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRole.vm	2014-06-13 08:08:04 +0000
@@ -1,6 +1,7 @@
 { "userRole":
   {
 	"name": "$!encoder.jsonEncode( ${userAuthorityGroup.name} )",
+	"uid": "$!encoder.jsonEncode( ${userAuthorityGroup.uid} )",
 	"members": "$!{userAuthorityGroup.members.size()}",
 	"dataSets": "$!{userAuthorityGroup.dataSets.size()}",
 	"reports": "$!{userAuthorityGroup.reports.size()}"

=== 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-05-27 02:41:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm	2014-06-13 08:08:04 +0000
@@ -44,10 +44,10 @@
     });
     
     $('#dcAvailable').selected({
-      url: '../api/dimensions/constraints.json',
+      url: '../api/categoryOptionGroupSets.json',
       target: $('#dcSelected'),
       search: $('#dcAvailableSearch'),
-      iterator: 'dimensions'
+      iterator: 'categoryOptionGroupSets'
     });
   });
 </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" autocomplete="off"></td>
+        <td colspan="3"><input type="text" id="inviteEmail" name="inviteEmail" value="validEmail@xxxxxxxxxx"></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" autocomplete="off"></td>
+        <td colspan="3"><input type="text" id="inviteUsername" name="inviteUsername"></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/allRole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm	2014-03-25 08:01:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm	2014-06-13 08:08:04 +0000
@@ -60,6 +60,7 @@
         <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
         <p><label>$i18n.getString( "members" ):</label><br/><span id="membersField"></span></p>
         <p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>
+        <p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
       </div>
 			
 			<div id="warningArea">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2014-03-23 18:26:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2014-06-13 08:08:04 +0000
@@ -93,6 +93,7 @@
                 <p><label>$i18n.getString( "disabled" ):</label><br><span id="disabledField"></span></p>
 				<p><label>$i18n.getString( "organisation_units" ):</label><br/><span id="assignedOrgunitField"></span></p>
 				<p><label>$i18n.getString( "roles" ):</label><br/><span id="roleField"></span></p>
+				<p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
 			</div>
 			
 			<div id="warningArea">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js	2013-12-04 14:39:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js	2014-06-13 08:08:04 +0000
@@ -7,6 +7,7 @@
     setInnerHTML('nameField', json.userRole.name);
     setInnerHTML('membersField', json.userRole.members);
     setInnerHTML('dataSetsField', json.userRole.dataSets);
+    setInnerHTML('idField', json.userRole.uid);
 
     showDetails();
   });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2014-04-08 19:36:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2014-06-13 08:08:04 +0000
@@ -46,6 +46,7 @@
 function showUserDetails( context ) {
   jQuery.post('getUser.action', { id: context.id }, function( json ) {
     setInnerHTML('usernameField', json.user.username);
+	setInnerHTML('idField', json.user.uid);
 
     var fullName = json.user.firstName + ", " + json.user.surname;
     setInnerHTML('fullNameField', fullName);

=== 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-05-27 02:41:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2014-06-13 08:08:04 +0000
@@ -52,10 +52,10 @@
     });
     
     $('#dcAvailable').selected({
-      url: '../api/dimensions/constraints.json',
+      url: '../api/categoryOptionGroupSets.json',
       target: $('#dcSelected'),
       search: $('#dcAvailableSearch'),
-      iterator: 'dimensions'
+      iterator: 'categoryOptionGroupSets'
     });
   });
 </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.dimensionConstraints
+    "objects": $userCredentials.cogsDimensionConstraints
 })
 
 <div id="showLessOptions" style="margin-bottom: 20px;"><a href="javascript:showUserOptions()">$i18n.getString( "show_less_options" )</a></div>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm	2014-03-23 18:26:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm	2014-06-13 08:08:04 +0000
@@ -71,6 +71,7 @@
 				<p><label>$i18n.getString( "last_login"):</label><br/><span id="lastLoginField"></span></p>
 				<p><label>$i18n.getString( "organisation_units" ):</label><br/><span id="assignedOrgunitField"></span></p>
 				<p><label>$i18n.getString( "roles" ):</label><br/><span id="roleField"></span></p>
+				<p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
 			</div>
 
 			<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">