=== 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 2009-11-03 09:05:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2009-12-03 07:59:20 +0000
@@ -121,7 +121,7 @@
class="org.hisp.dhis.dataset.action.PeriodTypeListAction">
/main.vm
/dhis-web-maintenance-dataset/addDataSet.vm
- javascript/dataSet.js,javascript/dataElementsList.js
+ javascript/shortName.js,javascript/dataSet.js,javascript/dataElementsList.js
F_DATASET_ADD
=== 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 2009-11-03 09:05:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2009-12-03 07:59:20 +0000
@@ -13,7 +13,7 @@
|
- |
+ |
|
@@ -106,12 +106,14 @@
var dataSetMembers = new Object();
var availableDataElements = new Object();
-#foreach ( $availableDataElement in $dataElements )
- availableDataElements['$availableDataElement.id'] = '$encoder.jsEscape( $availableDataElement.name, "'" )';
-#end
+
+ #foreach ( $availableDataElement in $dataElements )
+ availableDataElements['$availableDataElement.id'] = '$encoder.jsEscape( $availableDataElement.name, "'" )';
+ #end
initLists();
+ var previousName = '';
var nameField = document.getElementById( 'name' );
nameField.select();
nameField.focus();
=== added 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 1970-01-01 00:00:00 +0000
+++ 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
@@ -0,0 +1,21 @@
+
+// -----------------------------------------------------------------------------
+// $Id: shortName.js 1251 2006-01-31 06:43:27Z torgeilo $
+// -----------------------------------------------------------------------------
+
+function nameChanged()
+{
+ var nameField = document.getElementById( 'name' );
+ 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;
+ }
+
+ previousName = nameField.value;
+}