------------------------------------------------------------
revno: 2208
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: trunk
timestamp: Thu 2010-09-23 16:52:41 +0700
message:
Fix bug: While clicking on Detail button it is not showing Organisationunit
name.
modified:
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/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
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.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-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 2010-09-23 06:41:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2010-09-23 09:52:41 +0000
@@ -206,4 +206,5 @@
can_not_remove_last_super_user = Can not remove the last super user.
can_not_remove_last_super_user_role = Can not remove the last super user role.
excel_importing = Excel Importing
-delete_current_user = Delete Current User
\ No newline at end of file
+delete_current_user = Delete Current User
+number_of_orgunit = Number of organisation units
\ No newline at end of file
=== 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 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2010-09-23 09:52:41 +0000
@@ -56,6 +56,7 @@
<p><label>$i18n.getString( "firstName" ):</label><br/><span id="firstNameField"></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>
+ <p><label>$i18n.getString( "number_of_orgunit" ):</label><br/><span id="numberOrgunitField"></span></p>
</div>
<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
=== 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 2010-09-14 09:03:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js 2010-09-23 09:52:41 +0000
@@ -23,6 +23,9 @@
var phoneNumber = getElementValue( userElement, 'phoneNumber' );
setInnerHTML( 'phoneNumberField', phoneNumber ? phoneNumber : '[' + i18n_none + ']' );
+ var numberOrgunit = getElementValue( userElement, 'numberOrgunit' );
+ setInnerHTML( 'numberOrgunitField', numberOrgunit ? numberOrgunit : '[' + 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-24 14:45:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/responseUser.vm 2010-09-23 09:52:41 +0000
@@ -5,4 +5,5 @@
<firstName>$encoder.xmlEncode( $userCredentials.user.firstName )</firstName>
<email>$!encoder.xmlEncode( $userCredentials.user.email )</email>
<phoneNumber>$!encoder.xmlEncode( $userCredentials.user.phoneNumber )</phoneNumber>
+ <numberOrgunit>$userCredentials.user.organisationUnits.size()</numberOrgunit>
</user>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm 2010-09-23 09:52:41 +0000
@@ -54,7 +54,8 @@
<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( "number_of_orgunit" ):</label><br/><span id="numberOrgunitField"></span></p>
</div>
<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
