dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18803
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-04-03 16:43:49 +0700
message:
   Add User information in Organisation details.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm
  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/organisationUnit.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/jsonOrganisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm	2014-07-13 07:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm	2015-04-03 09:43:49 +0000
@@ -15,6 +15,11 @@
   "coordinates": "$!encoder.jsonEncode( ${organisationUnit.coordinates} )",
   "latitude": "$!{organisationUnit.latitude}",
   "longitude": "$!{organisationUnit.longitude}",
-	"hasChild": $!{organisationUnit.hasChild()}
+  "hasChild": $!{organisationUnit.hasChild()},
+  "user": {
+		"uid": "$!organisationUnit.user.uid",
+		"name":"$!encoder.jsonEncode( ${organisationUnit.user.name} )"
+	}
   }
+   
 }

=== 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	2014-11-20 15:06:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2015-04-03 09:43:49 +0000
@@ -40,6 +40,7 @@
 		setInnerHTML( 'descriptionField', json.organisationUnit.description );
 		setInnerHTML( 'openingDateField', json.organisationUnit.openingDate );
 		setInnerHTML( 'idField', json.organisationUnit.uid );
+		setInnerHTML( 'createdByField', json.organisationUnit.user.name );
 
 		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/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2014-10-15 12:19:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2015-04-03 09:43:49 +0000
@@ -80,6 +80,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( "created_by" ):</label><br/><span id="createdByField"></span></p>
         <p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
       </div>