=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm 2014-04-04 11:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm 2014-04-09 04:03:06 +0000
@@ -67,7 +67,6 @@
-
|
@@ -101,19 +100,6 @@
|
-
-
- |
-
-
- |
- |
-
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addAttributeForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addAttributeForm.js 2014-04-04 11:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addAttributeForm.js 2014-04-09 04:03:06 +0000
@@ -1,9 +1,13 @@
-jQuery(document).ready( function(){
- validation( 'addAttributeForm', function(form){
- form.submit();
- })
-
- checkValueIsExist( "name", "validateAttribute.action");
- checkValueIsExist( "shortName", "validateAttribute.action");
- checkValueIsExist( "code", "validateAttribute.action");
-});
\ No newline at end of file
+jQuery(document).ready(function() {
+ validation('addAttributeForm', function( form ) {
+ form.submit();
+ })
+
+ checkValueIsExist("name", "validateAttribute.action");
+ checkValueIsExist("shortName", "validateAttribute.action");
+ checkValueIsExist("code", "validateAttribute.action");
+
+ $('#unique').on('click', function() {
+ $("[name='localIdField']").toggle();
+ });
+});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateAttributeForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateAttributeForm.js 2014-04-04 11:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateAttributeForm.js 2014-04-09 04:03:06 +0000
@@ -1,9 +1,17 @@
-jQuery(document).ready( function(){
- validation( 'updateAttributeForm', function(form){
- form.submit();
- });
-
- checkValueIsExist( "name", "validateAttribute.action", {id:getFieldValue('id')});
- checkValueIsExist( "shortName", "validateAttribute.action", {id:getFieldValue('id')});
- checkValueIsExist( "code", "validateAttribute.action", {id:getFieldValue('id')});
-});
\ No newline at end of file
+jQuery(document).ready(function() {
+ validation('updateAttributeForm', function( form ) {
+ form.submit();
+ });
+
+ checkValueIsExist("name", "validateAttribute.action", {id: getFieldValue('id')});
+ checkValueIsExist("shortName", "validateAttribute.action", {id: getFieldValue('id')});
+ checkValueIsExist("code", "validateAttribute.action", {id: getFieldValue('id')});
+
+ if( $('#unique').is(':checked') ) {
+ $("[name='localIdField']").show();
+ }
+
+ $('#unique').on('click', function() {
+ $("[name='localIdField']").toggle();
+ });
+});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm 2014-04-04 11:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm 2014-04-09 04:03:06 +0000
@@ -63,7 +63,6 @@
-
@@ -97,20 +96,7 @@
|
-
-
- |
-
-
- |
- |
-
-
+