dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15670
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-13 16:17:44 +0800
message:
  Add uid in the details div of user group.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserGroup.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/usergroup.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/userGroupList.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/jsonUserGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserGroup.vm	2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserGroup.vm	2014-06-13 08:17:44 +0000
@@ -1,6 +1,7 @@
 { "userGroup":
   {
     "id": $!{group.id},
+    "uid": "$!{group.uid}",
     "name": "$!encoder.jsonEncode( ${group.name} )",
 	"noOfUsers": "${memberCount}"
   }

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/usergroup.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/usergroup.js	2013-12-06 15:29:45 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/usergroup.js	2014-06-13 08:17:44 +0000
@@ -18,6 +18,7 @@
     function( json ) {
       setInnerHTML('nameField', json.userGroup.name);
       setInnerHTML('noOfGroupField', json.userGroup.noOfUsers);
+      setInnerHTML('idField', json.userGroup.uid);
 
       showDetails();
     });

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/userGroupList.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/userGroupList.vm	2013-12-06 15:29:45 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/userGroupList.vm	2014-06-13 08:17:44 +0000
@@ -58,6 +58,7 @@
           </div>
           <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
           <p><label>$i18n.getString( "no_of_Users" ):</label><br/><span id="noOfGroupField"></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">