dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4851
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-10-06 09:29:00 +0200
message:
  removed requirements for non-empty groups in data element / indicators groups
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.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/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2011-10-05 13:46:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2011-10-06 07:29:00 +0000
@@ -249,7 +249,7 @@
             "required" : true,
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : true,
-            "rangelength" : [ 3, 150 ]
+            "rangelength" : [ 2, 150 ]
         }
     },
     "dataElementGroupSet" : {
@@ -319,7 +319,7 @@
     "indicatorGroup" : {
         "name" : {
             "required" : true,
-            "rangelength" : [ 3, 150 ],
+            "rangelength" : [ 2, 150 ],
             "alphanumericwithbasicpuncspaces" : true
         }
     },

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm	2011-10-03 08:50:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm	2011-10-06 07:29:00 +0000
@@ -41,9 +41,7 @@
 	<tr>
 		<th>$i18n.getString( "available_data_elements" )</th>
 		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" multiple="multiple" style="display:none" class="{validate:{required:true}}"/>
-		</th>
+		<th>$i18n.getString( "group_members" )</th>
 	</tr>
 
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm	2011-10-03 08:50:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm	2011-10-06 07:29:00 +0000
@@ -41,9 +41,7 @@
 	<tr>
 		<th>$i18n.getString( "available_indicators" )</th>
 		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>
-		</th>
+		<th>$i18n.getString( "group_members" )</th>
 	</tr>
 
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm	2011-10-03 08:50:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm	2011-10-06 07:29:00 +0000
@@ -46,9 +46,7 @@
 	<tr>
 		<th>$i18n.getString( "available_data_elements" )</th>
 		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" multiple="multiple" style="display:none" class="{validate:{required:true}}"/>
-		</th>
+		<th>$i18n.getString( "group_members" )</th>
 	</tr>
 
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm	2011-10-03 08:50:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm	2011-10-06 07:29:00 +0000
@@ -47,9 +47,7 @@
 	<tr>
 		<th>$i18n.getString( "available_indicators" )</th>
 		<th></th>
-		<th>$i18n.getString( "group_members" )
-			<select id="memberValidator" class="{validate:{required:true}}" style="display:none"/>
-		</th>
+		<th>$i18n.getString( "group_members" )</th>
 	</tr>
 
 	<tr>