=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-08-17 07:26:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2010-08-19 10:26:15 +0000
@@ -170,7 +170,7 @@
class="org.hisp.dhis.dataset.action.PeriodTypeListAction">
/main.vm
/dhis-web-maintenance-dataset/editDataSet.vm
- javascript/dataSet.js
+ javascript/shortName.js,javascript/dataSet.js
F_DATASET_UPDATE
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2010-08-17 07:26:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2010-08-19 10:26:15 +0000
@@ -1,7 +1,10 @@
$i18n.getString( "add_dataset" )
@@ -108,6 +111,3 @@
-
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2010-08-17 07:26:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2010-08-19 10:26:15 +0000
@@ -1,7 +1,10 @@
$i18n.getString( "edit_dataset" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js 2009-12-03 07:59:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/shortName.js 2010-08-19 10:26:15 +0000
@@ -9,13 +9,15 @@
var shortNameField = document.getElementById( 'shortName' );
var maxLength = parseInt( shortNameField.maxLength );
- if ( previousName != nameField.value
- && nameField.value.length <= maxLength
- && ( shortNameField.value == previousName
- || shortNameField.value.length == 0 ))
- {
- shortNameField.value = nameField.value;
+ if ( nameField.value.length >= 20 )
+ {
+ //if ( (previousName != nameField.value)
+ //&& (nameField.value.length <= maxLength)
+ //&& ( shortNameField.value == previousName
+ //|| shortNameField.value.length == 0 ) )
+ //{}
+
+ shortNameField.value = nameField.value;
}
-
previousName = nameField.value;
}