dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37250
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19067: minor fix
------------------------------------------------------------
revno: 19067
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-04-30 13:14:45 +0700
message:
minor fix
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.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-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm 2015-04-30 06:07:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm 2015-04-30 06:14:45 +0000
@@ -44,7 +44,7 @@
<td>
<div style="width:100%">
<div id="selectionTreeContainer" style="display:none;">
- #if( $hideCtrls )
+ #if( $showCtrls )
<div id="selectionCtrl">
<input type="button" value="$i18n.getString( 'select_at_level' )" onclick="selectOrganisationUnitAtLevel()" style="width:10em"/>
<select id="levelList" name="levelList" style="width:10em"/>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2015-04-30 06:07:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2015-04-30 06:14:45 +0000
@@ -88,7 +88,9 @@
</li>
#end
-#macro( organisationUnitSelectionTree $cleanAll $multipleSelectionAllowed $required $hideCtrls )
+#macro( organisationUnitSelectionTree $cleanAll $multipleSelectionAllowed $required $showCtrls )
+#if( "$!showCtrls" == "" ) #set( $showCtrls = true ) #end
+
#if( $multipleSelectionAllowed )
#parse( "/dhis-web-commons/oust/selectionTreeMultipleSelect.vm" )
#else
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2015-04-30 06:07:26 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2015-04-30 06:14:45 +0000
@@ -43,7 +43,7 @@
<tr>
<td style="width:80px">$i18n.getString( "to_org_unit" )</td>
<td>
-#organisationUnitSelectionTree( true true false true )
+#organisationUnitSelectionTree( true true false false )
</td>
</tr>
#else