dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 111
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-03-24 15:45:47 +0100
message:
  dhis-web-maintenance-user: Fixed bug #341538 Organisation Unit not shown
modified:
  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/user.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/responseUser.vm

=== 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	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2009-03-24 14:45:47 +0000
@@ -52,8 +52,8 @@
 				<p><label>$i18n.getString( "username" ):</label><br><span id="usernameField"></span></p>
 				<p><label>$i18n.getString( "surname" ):</label><br><span id="surnameField"></span></p>
 				<p><label>$i18n.getString( "firstName" ):</label><br><span id="firstNameField"></span></p>
-				<p><label>$i18n.getString( "organisation_unit" ):</label><br><span id="organisationNameField"></span></p>
-				<p><label>$i18n.getString( "email" ):</label><br><span id="emailField"></span></p>			
+				<p><label>$i18n.getString( "email" ):</label><br><span id="emailField"></span></p>
+                <p><label>$i18n.getString( "phone_number" ):</label><br><span id="phoneNumberField"></span></p>
 			</div>
 
 		</td>

=== 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	2009-03-24 14:27:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2009-03-24 14:45:47 +0000
@@ -20,8 +20,8 @@
     var email = getElementValue( userElement, 'email' );
     setFieldValue( 'emailField', email ? email : '[' + i18n_none + ']' );
 
-    var organisationName = getElementValue( userElement, 'organisationName' );
-	setFieldValue( 'organisationNameField', organisationName ? organisationName : '[' + i18n_none + ']' );
+    var phoneNumber = getElementValue( userElement, 'phoneNumber' );
+	setFieldValue( 'phoneNumberField', phoneNumber ? phoneNumber : '[' + i18n_none + ']' );
 
     showDetails();
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/responseUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/responseUser.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/responseUser.vm	2009-03-24 14:45:47 +0000
@@ -4,5 +4,5 @@
   <surname>$encoder.xmlEncode( $userCredentials.user.surname )</surname>
   <firstName>$encoder.xmlEncode( $userCredentials.user.firstName )</firstName>
   <email>$!encoder.xmlEncode( $userCredentials.user.email )</email>
-  <organisationName>$!encoder.xmlEncode( $userCredentials.user.organisationUnit.name )</organisationName>
+  <phoneNumber>$!encoder.xmlEncode( $userCredentials.user.phoneNumber )</phoneNumber>
 </user>



--
Trunk
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.