dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2196
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2010-11-28 01:12:48 +0700
message:
  Fixed bug <660408> Code not showing in orgunit detail popup
modified:
  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-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	2010-11-20 08:35:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2010-11-27 18:12:48 +0000
@@ -25,7 +25,10 @@
     setInnerHTML( 'shortNameField', getElementValue( unitElement, 'shortName' ) );
     setInnerHTML( 'openingDateField', getElementValue( unitElement, 'openingDate' ) );
     
-    var closedDate = getElementValue( unitElement, 'closedDate' );
+    var orgUnitCode = getElementValue( unitElement, 'code' );
+    setInnerHTML( 'codeField', orgUnitCode ? orgUnitCode : '[' + none + ']' );
+	
+	var closedDate = getElementValue( unitElement, 'closedDate' );
     setInnerHTML( 'closedDateField', closedDate ? closedDate : '[' + none + ']' );
 
     var commentValue = getElementValue( unitElement, 'comment' );

=== 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	2010-10-07 12:19:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2010-11-27 18:12:48 +0000
@@ -49,6 +49,7 @@
 				</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( "opening_date" ):</label><br/><span id="openingDateField"></span></p>
 				<p><label>$i18n.getString( "closed_date" ):</label><br/><span id="closedDateField"></span></p>
 				<p><label>$i18n.getString( "registers_date" ):</label><br/><span id="activeField"></span></p>