dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3381
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-04-14 15:28:01 +0700
message:
  Fix bug: Don't add/update members for Category and CategoryCombo.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.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-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm	2011-04-11 14:03:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm	2011-04-14 08:28:01 +0000
@@ -3,7 +3,7 @@
 		validation2( 'addDataElementCategoryComboForm', function( form ){ 
 			validateSelectedCategories( form );
 		}, {
-			'beforeValidationHandler': function() { listValidator( 'selectedCategories', 'selectedList' ); },
+			'beforeValidateHandler': function() { listValidator( 'selectedCategories', 'selectedList' ); },
 			'rules': getValidationRules("dateElementCategoryCombo")
 		});
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm	2011-04-11 14:03:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm	2011-04-14 08:28:01 +0000
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 	jQuery(document).ready(	function() {
 		validation2( 'addDataElementCategoryForm', function( form ){ form.submit() }, {
-			'beforeValidationHandler': function() { listValidator( 'memberValidator', 'categoryOptionNames' ); },
+			'beforeValidateHandler': function() { selectAllById('categoryOptionNames'); listValidator( 'memberValidator', 'categoryOptionNames' ); },
 			'rules': getValidationRules("dateElementCategory")
 		});
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm	2011-04-11 14:03:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm	2011-04-14 08:28:01 +0000
@@ -3,7 +3,7 @@
 		validation2( 'editDataElementCategoryComboForm', function( form ) { 
 			validateSelectedCategories( form );
 		}, {
-			'beforeValidationHandler': function() { listValidator( 'selectedCategories', 'selectedList' ); },
+			'beforeValidateHandler': function() { listValidator( 'selectedCategories', 'selectedList' ); },
 			'rules': getValidationRules("dateElementCategoryCombo")
 		});
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm	2011-04-11 14:03:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm	2011-04-14 08:28:01 +0000
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 	jQuery(document).ready(	function() {
 		validation2( 'editDataElementCategoryForm', function( form ){ form.submit()}, {
-			'beforeValidationHandler': function() { listValidator( 'memberValidator', 'categoryOptions' ); },
+			'beforeValidateHandler': function() { listValidator( 'memberValidator', 'categoryOptions' ); },
 			'rules': getValidationRules("dateElementCategory")
 		});