dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1996
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-08-28 19:18:54 +0700
message:
  Fix bug: Cencel Button of Min-Max Value Generation sub-module of Data Administration module not working.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GenerateMinMaxValuesAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
  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/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GenerateMinMaxValuesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GenerateMinMaxValuesAction.java	2010-06-01 10:24:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GenerateMinMaxValuesAction.java	2010-08-28 12:18:54 +0000
@@ -130,16 +130,14 @@
     public String execute()
         throws Exception
     {
-
+        if ( dataSetIds == null )
+        {
+            organisationUnitSelectionManager.clearSelectedOrganisationUnits();
+            return INPUT;
+        }
+        
         Collection<OrganisationUnit> orgUnits = organisationUnitSelectionManager.getSelectedOrganisationUnits();
-
-        if ( dataSetIds == null )
-        {
-            message = i18n.getString( "not_choose_dataset" );
-            return INPUT;
-        }
-
-        if ( orgUnits == null )
+        if ( orgUnits == null || orgUnits.size() ==0 )
         {
             message = i18n.getString( "not_choose_organisation" );
             return INPUT;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-08-28 07:26:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2010-08-28 12:18:54 +0000
@@ -307,7 +307,6 @@
 				../dhis-web-commons/util/validate/jquery.validate.js,
 				../dhis-web-commons/util/jquery.metadata.js,
 				../dhis-web-commons/util/validate/additional-methods.js,
-				../dhis-web-commons/validationMessages.action,
 				javascript/minMaxValidation.js </param>
 		</action>
 		

=== 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	2010-08-28 07:26:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-08-28 12:18:54 +0000
@@ -18,7 +18,6 @@
 										validateForm();
 									}
 				});
-				jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
 			}
 	);
 
@@ -75,12 +74,12 @@
     <td align="center">&nbsp;</td>
     <td align="left"><input type="submit" id="submitButton" style="width:10em" value="$i18n.getString( 'generate' )">
 	<input type="button" onclick="removeMinMaxValue()" id="" style="width:10em" value="$i18n.getString( 'remove' )">
-	  <input type="button"" style="width:10em" onClick="window.location.href='listReportExcel.action'" value="$i18n.getString( 'cancel' )"></td>
+	  <input type="button"" style="width:10em" onClick="window.location.href='index.action'" value="$i18n.getString( 'cancel' )"></td>
   
   </tr>
 </table>
 </form>
-<span id='message' style='display: block'>$!message</span>
+<span id='message' #if($!message) style='display: block' #end>$!message</span>
 <script type="text/javascript">
 
 	var i18n_loading = '$encoder.jsEncode( $i18n.getString( "loading" ) )';