dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4534
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-07 10:16:04 +0200
message:
  Completed r 4518, set packaging to WAR for web user module and updated the details view for user-per-orgunit view
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
  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/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml	2011-09-06 05:37:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml	2011-09-07 08:16:04 +0000
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>dhis-web-maintenance-user</artifactId>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 	<name>DHIS User Maintenance</name>
 
 	<build>

=== 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	2011-09-04 10:21:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm	2011-09-07 08:16:04 +0000
@@ -65,8 +65,9 @@
 				<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>
-				<p><label>$i18n.getString( "last_login"):</label><br/><span id="lastLoginField"></span></p>				
+				<p><label>$i18n.getString( "last_login"):</label><br/><span id="lastLoginField"></span></p>
+				<p><label>$i18n.getString( "organisation_units" ):</label><br/><span id="assignedOrgunitField"></span></p>
+				<p><label>$i18n.getString( "roles" ):</label><br/><span id="roleField"></span></p>
 			</div>
 
 			<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">