=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOption.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOption.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOption.vm 2015-02-06 13:00:03 +0000
@@ -0,0 +1,8 @@
+{ "option":
+ {
+ "id": "$option.id",
+ "uid": "$option.uid",
+ "code": "$!encoder.jsonEncode( ${option.code} )",
+ "name": "$!encoder.jsonEncode( ${option.displayName} )"
+ }
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2014-09-12 15:54:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2015-02-06 13:00:03 +0000
@@ -713,5 +713,9 @@
F_OPTIONSET_MANAGEMENT
+
+ /dhis-web-commons/ajax/jsonOption.vm
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/option.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/option.js 2014-07-29 07:52:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/option.js 2015-02-06 13:00:03 +0000
@@ -44,3 +44,17 @@
setFieldValue('option', '');
$("#option").focus();
}
+
+// -----------------------------------------------------------------------------
+// Add options constant
+// -----------------------------------------------------------------------------
+
+function showOptionDetails( context ) {
+ jQuery.get('getOption.action', { optionId: context.id },
+ function( json ) {
+ setInnerHTML('nameField', json.option.name);
+ setInnerHTML('codeField', json.option.code);
+ setInnerHTML('idField', json.option.uid);
+ showDetails();
+ });
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm 2014-09-30 16:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm 2015-02-06 13:00:03 +0000
@@ -18,6 +18,7 @@
$i18n.getString( "edit" )
$i18n.getString( "translation_translate" )
$i18n.getString( "remove" )
+ $i18n.getString( "show_details" )
@@ -79,7 +80,7 @@
-
+