=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm 2011-09-06 07:57:07 +0000
@@ -13,4 +13,9 @@
$!encoder.xmlEncode( $dataElement.url )
$!format.formatDate( $dataElement.lastUpdated )
$!encoder.xmlEncode( $dataElement.categoryCombo.name )
+
+ #foreach( $ds in $dataElement.dataSets )
+ $!encoder.xmlEncode( $ds.name )
+ #end
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-05-12 13:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-09-06 07:57:07 +0000
@@ -46,7 +46,7 @@
#if ( $!dataDictionaryMode && $dataDictionaryMode == "extended" )
-
+
#else
#end
@@ -99,6 +99,7 @@
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2011-09-06 07:57:07 +0000
@@ -95,6 +95,14 @@
var lastUpdated = getElementValue( dataElementElement, 'lastUpdated' );
setInnerHTML( 'lastUpdatedField', lastUpdated ? lastUpdated : '[' + i18n_none + ']' );
+ var temp = '';
+ var dataSets = dataElementElement.getElementsByTagName( 'dataSet' );
+ for ( var i = 0 ; i < dataSets.length ; i ++ )
+ {
+ temp += dataSets[i].firstChild.nodeValue + '
';
+ }
+ setInnerHTML( 'dataSetsField', temp ? temp : '[' + i18n_none + ']' );
+
showDetails();
}