dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3992
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-06-22 22:37:05 +0300
message:
  Fixed bug: #761690. Made orgunit select required in min-max value generation. Also changed the label "cancel" => "back" since it was the only way to exit the form (after generation is run, it does not return to dataadmin index page).
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.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-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2011-06-22 07:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2011-06-22 19:37:05 +0000
@@ -12,7 +12,7 @@
 <table>
   <tr>
     <th colspan="2">$i18n.getString('available_dataset')</th>
-    <td rowspan="2">#organisationUnitSelectionTree( false, true, false ) </td>
+    <td rowspan="2">#organisationUnitSelectionTree( false, true, true ) </td>
   </tr>
   <tr>
     <td colspan="2" rowspan="2">
@@ -28,7 +28,7 @@
   	<td>
 	  	<input type="submit" id="saveButton" onclick="javascipt: isGenerate = true;" style="width:10em" value="$i18n.getString( 'generate' )">
 		<input type="submit" id="removeButton" onclick="javascipt: isGenerate = false;" style="width:10em" value="$i18n.getString( 'remove' )"/>
-		<input type="button" style="width:10em" onClick="window.location.href='index.action'" value="$i18n.getString( 'cancel' )"/>
+		<input type="button" style="width:10em" onClick="window.location.href='index.action'" value="$i18n.getString( 'back' )"/>
 	</td>
   </tr>
 </table>