dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13726
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-01-14 20:07:02 +0700
message:
  change code.length to 50 for indicator, update all validation rules for code to be 0 -> 50 in length
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js


--
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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2014-01-14 10:30:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2014-01-14 13:07:02 +0000
@@ -368,6 +368,7 @@
         executeSql( "ALTER TABLE indicator ADD CONSTRAINT indicator_code_key UNIQUE(code)" );
         executeSql( "ALTER TABLE organisationunit ADD CONSTRAINT organisationunit_code_key UNIQUE(code)" );
         executeSql( "ALTER TABLE organisationunit ALTER COLUMN code TYPE varchar(50)" );
+        executeSql( "ALTER TABLE indicator ALTER COLUMN code TYPE varchar(50)" );
 
         // remove uuid
 

=== 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	2014-01-14 10:30:29 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2014-01-14 13:07:02 +0000
@@ -73,7 +73,7 @@
             "rangelength" : [ 2, 50 ]
         },
         "code" : {
-            "rangelength" : [ 0, 49 ],
+            "rangelength" : [ 0, 50 ],
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : false
         },
@@ -121,7 +121,7 @@
         "code" : {
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : false,
-            "rangelength" : [ 0, 25 ]
+            "rangelength" : [ 0, 50 ]
         }
     },
     "organisationUnitGroupSet" : {
@@ -163,7 +163,7 @@
         "code" : {
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : false,
-            "rangelength" : [ 0, 25 ]
+            "rangelength" : [ 0, 50 ]
         },
         "expiryDays": {
             "digits" : true
@@ -227,7 +227,7 @@
             "notOnlyDigits" : true
         },
         "code" : {
-            "rangelength" : [ 0, 25 ],
+            "rangelength" : [ 0, 50 ],
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : false
         },
@@ -278,7 +278,7 @@
         "code" : {
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : false,
-            "rangelength" : [ 0, 25 ]
+            "rangelength" : [ 0, 50 ]
         }
     },
     "dataElementGroupSet" : {
@@ -320,7 +320,7 @@
             "alphanumericwithbasicpuncspaces" : true
         },
         "code" : {
-            "rangelength" : [ 0, 25 ],
+            "rangelength" : [ 0, 50 ],
             "alphanumericwithbasicpuncspaces" : true,
             "notOnlyDigits" : false
         },