dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15668
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-13 16:01:34 +0800
message:
  Add uid property in the last property in the details area for objects in dhis-web-maintenance-organisationunit module.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties


--
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/jsonOrganisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm	2012-01-22 11:28:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm	2014-06-13 08:01:34 +0000
@@ -1,6 +1,7 @@
 { "organisationUnitGroup":
   {
     "id": "$!{organisationUnitGroup.id}",
+    "uid": "$!{organisationUnitGroup.uid}",
     "name": "$!encoder.jsonEncode( ${organisationUnitGroup.displayName} )",
     "memberCount": "$!{organisationUnitGroup.members.size()}"
   }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm	2012-01-22 11:28:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm	2014-06-13 08:01:34 +0000
@@ -1,6 +1,7 @@
 { "organisationUnitGroupSet":
   {
 	"id": "${organisationUnitGroupSet.id}",
+	"uid": "${organisationUnitGroupSet.uid}",
 	"name": "$!encoder.jsonEncode( ${organisationUnitGroupSet.displayName} )",
 	"description": "$!encoder.jsonEncode( ${organisationUnitGroupSet.description} )",
 	"compulsory": "$!{organisationUnitGroupSet.compulsory}",

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2014-06-01 11:31:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2014-06-13 08:01:34 +0000
@@ -107,4 +107,5 @@
 identifier=Identifier
 short_name_in_use=The short name is already in use. Please choose a different short name
 show_all_sections = Show all sections
-org_unit_levels_not_yet_saved=Organisation unit level is not yet saved, please save
\ No newline at end of file
+org_unit_levels_not_yet_saved=Organisation unit level is not yet saved, please save
+id=Id
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2013-12-20 13:01:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2014-06-13 08:01:34 +0000
@@ -38,6 +38,7 @@
 		setInnerHTML( 'shortNameField', json.organisationUnit.shortName );
 		setInnerHTML( 'descriptionField', json.organisationUnit.description );
 		setInnerHTML( 'openingDateField', json.organisationUnit.openingDate );
+		setInnerHTML( 'idField', json.organisationUnit.uid );
 
 		var orgUnitCode = json.organisationUnit.code;
 		setInnerHTML( 'codeField', orgUnitCode ? orgUnitCode : '[' + none + ']' );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js	2013-12-04 13:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js	2014-06-13 08:01:34 +0000
@@ -9,6 +9,7 @@
       setInnerHTML('shortNameField', json.organisationUnitGroup.shortName);
       setInnerHTML('codeField', json.organisationUnitGroup.code);
       setInnerHTML('memberCountField', json.organisationUnitGroup.memberCount);
+      setInnerHTML('idField', json.organisationUnitGroup.uid);
 
       showDetails();
     });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js	2013-12-04 13:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js	2014-06-13 08:01:34 +0000
@@ -12,6 +12,7 @@
 		function ( json ) {
 			setInnerHTML( 'nameField', json.organisationUnitGroupSet.name );
 			setInnerHTML( 'descriptionField', json.organisationUnitGroupSet.description );
+			setInnerHTML( 'idField', json.organisationUnitGroupSet.uid );
 			
 			var compulsory = json.organisationUnitGroupSet.compulsory;
 			

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2013-12-04 13:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2014-06-13 08:01:34 +0000
@@ -78,6 +78,7 @@
 				<p><label>$i18n.getString( "comment" ):</label><br/><span id="commentField"></span></p>
                 <p><label>$i18n.getString( "url" ):</label><br/><span id="urlField"></span></p>
                 <p><label>$i18n.getString( "last_updated" ):</label><br/><span id="lastUpdatedField"></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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm	2013-12-04 13:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm	2014-06-13 08:01:34 +0000
@@ -62,11 +62,12 @@
       <div id="detailsArea">
         <div id="hideDetailsArea">
           <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
-        </div>
+			</div>
 				<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
 				<p><label>$i18n.getString( "short_name" ):</label><br/><span id="shortNameField"></span></p>
 				<p><label>$i18n.getString( "code" ):</label><br/><span id="codeField"></span></p>
 				<p><label>$i18n.getString( "number_of_group_members" ):</label><br/><span id="memberCountField"></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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm	2014-03-25 07:54:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm	2014-06-13 08:01:34 +0000
@@ -63,12 +63,13 @@
       <div id="detailsArea">
         <div id="hideDetailsArea">
         <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
-      </div>
-      <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-      <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
-      <p><label>$i18n.getString( "compulsory" ):</label><br><span id="compulsoryField"></span></p>
-      <p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
-			</div>
+		  </div>
+		    <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+		    <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+		    <p><label>$i18n.getString( "compulsory" ):</label><br><span id="compulsoryField"></span></p>
+		    <p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
+			<p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
+		  </div>
 			
       <div id="warningArea">
         <div id="hideDetailsArea">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-05-15 13:16:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-06-13 08:01:34 +0000
@@ -343,4 +343,5 @@
 available_dimension_restrictions_for_data_analytics=Available dimension restrictions for data analytics
 selected_dimension_restrictions_for_data_analytics=Selected dimension restrictions for data analytics
 show_more_options=Show more options
-show_less_options=Show less options
\ No newline at end of file
+show_less_options=Show less options
+id=Id
\ No newline at end of file