=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2014-06-06 19:29:39 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2014-06-13 09:11:39 +0000 @@ -271,4 +271,5 @@ confirm_unaccept=Are you sure you want to unaccept this data set approval? approval_entity=Approval entity approval_status=Approval status -please_make_selection=Please make a selection below \ No newline at end of file +please_make_selection=Please make a selection below +id=Id \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js 2013-12-06 13:03:52 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js 2014-06-13 09:11:39 +0000 @@ -51,6 +51,7 @@ function showReportDetails( context ) { jQuery.get('getReport.action', { "id": context.id }, function( json ) { setInnerHTML('nameField', json.report.name); + setInnerHTML('idField', json.report.uid); var reportTableName = json.report.reportTableName; setInnerHTML('reportTableNameField', reportTableName ? reportTableName : '[' + i18n_none + ']'); === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm 2012-07-19 07:37:36 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm 2014-06-13 09:11:39 +0000 @@ -1,6 +1,7 @@ { "report": { "id": $!{report.id}, + "uid": "$!{report.uid}", "name": "$!encoder.jsonEncode( ${report.displayName} )", "reportTableName": "$!encoder.jsonEncode( ${report.reportTable.displayName} )", "orgGroupSets": "$!{report.usingOrgUnitGroupSets}" === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2013-12-06 13:03:52 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2014-06-13 09:11:39 +0000 @@ -44,7 +44,6 @@ - @@ -72,10 +71,11 @@
$i18n.getString( 'hide_details' )
-


-


-


- +


+


+


+


+
$i18n.getString(
$i18n.getString( "name" )