dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2362
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-12-13 16:26:32 +0100
message:
  Fixed minor bug with hierarchy operations
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/menuWithTree.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.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-27 18:12:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2010-12-13 15:26:32 +0000
@@ -7,6 +7,8 @@
     window.location.href = 'organisationUnit.action';
 }
 
+selection.setListenerFunction( organisationUnitSelected );
+
 // -----------------------------------------------------------------------------
 // View details
 // -----------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/menuWithTree.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/menuWithTree.vm	2010-11-30 08:54:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/menuWithTree.vm	2010-12-13 15:26:32 +0000
@@ -2,7 +2,3 @@
 #parse( "/dhis-web-maintenance-organisationunit/menu.vm" )
 
 #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )
-
-<script>
-selection.setListenerFunction( organisationUnitSelected );
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm	2010-12-12 20:39:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm	2010-12-13 15:26:32 +0000
@@ -5,11 +5,35 @@
 
 <tr>
 <td><b>$i18n.getString( "short_name" ):</b></td>
-<td>$encoder.htmlEncode( $organisationUnit.shortName )</td>
+<td>$!encoder.htmlEncode( $organisationUnit.shortName )</td>
 </tr>
 <tr>
 <td><b>$i18n.getString( "code" ):</b></td>
-<td>$encoder.htmlEncode( $organisationUnit.code )</td>
+<td>$!encoder.htmlEncode( $organisationUnit.code )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "opening_date" ):</b></td>
+<td>$!format.formatDate( $organisationUnit.openingDate )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "closed_date" ):</b></td>
+<td>$!format.formatDate( $organisationUnit.closedDate )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "active" ):</b></td>
+<td>#formatBool( $organisationUnit.active )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "comment" ):</b></td>
+<td>$!encoder.htmlEncode( $organisationUnit.comment )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "url" ):</b></td>
+<td>$!encoder.htmlEncode( $organisationUnit.url )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "last_updated" ):</b></td>
+<td>$!format.formateDate( $organisationUnit.lastUpdated )</td>
 </tr>
 
 #foreach( $groupSet in $groupSets )