dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10209
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-14 17:50:51 +0700
message:
  more validation cleanup
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.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-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java	2013-02-08 04:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java	2013-03-14 10:50:51 +0000
@@ -136,38 +136,6 @@
         throws Exception
     {
         // ---------------------------------------------------------------------
-        // Name
-        // ---------------------------------------------------------------------
-
-        if ( name != null )
-        {
-            DataSet match = dataSetService.getDataSetByName( name ).get( 0 );
-
-            if ( match != null && (dataSetId == null || match.getId() != dataSetId) )
-            {
-                message = i18n.getString( "duplicate_names" );
-
-                return ERROR;
-            }
-        }
-
-        // ---------------------------------------------------------------------
-        // Short name
-        // ---------------------------------------------------------------------
-
-        if ( shortName != null )
-        {
-            DataSet match = dataSetService.getDataSetByShortName( shortName ).get( 0 );
-
-            if ( match != null && (dataSetId == null || match.getId() != dataSetId) )
-            {
-                message = i18n.getString( "duplicate_short_names" );
-
-                return ERROR;
-            }
-        }
-
-        // ---------------------------------------------------------------------
         // Code
         // ---------------------------------------------------------------------
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js	2013-02-08 04:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js	2013-03-14 10:50:51 +0000
@@ -9,7 +9,5 @@
 		'rules' : getValidationRules("dataSet")
 	});
 
-	// checkValueIsExist("name", "validateDataSet.action");
-	// checkValueIsExist("shortName", "validateDataSet.action");
 	checkValueIsExist("code", "validateDataSet.action");
 });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js	2013-02-08 04:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js	2013-03-14 10:50:51 +0000
@@ -9,20 +9,6 @@
 		'rules' : getValidationRules("dataSet")
 	});
 
-    /*
-	checkValueIsExist("name", "validateDataSet.action", {
-		dataSetId : function() {
-			return jQuery("#dataSetId").val();
-		}
-	});
-
-	checkValueIsExist("shortName", "validateDataSet.action", {
-		dataSetId : function() {
-			return jQuery("#dataSetId").val();
-		}
-	});
-    */
-
 	checkValueIsExist("code", "validateDataSet.action", {
 		dataSetId : function() {
 			return jQuery("#dataSetId").val();