dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6040
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 20:42:53 +0100
message:
  Added authority for data mart
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm	2012-02-05 13:27:40 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm	2012-02-17 19:42:53 +0000
@@ -6,8 +6,8 @@
     "name": "$!encoder.jsonEncode( ${dataSet.displayName} )",
     "shortName": "$!encoder.jsonEncode( ${dataSet.displayShortName} )",
     "periodTypeId": "$!{dataSet.periodTypeId}",
-    "version": "$!{dataSet.version}"
-    #if( $dataSet.expiryDays ),"expiryDays": "$!encoder.jsonEncode( ${dataSet.expiryDays} ) #end
+    "version": "$!{dataSet.version}",
+    "expiryDays": "$!encoder.jsonEncode( ${dataSet.expiryDays} )"
   }#if( $velocityCount < $size ),#end
 #end
 ]

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-02-17 19:42:53 +0000
@@ -171,6 +171,8 @@
 F_OPTIONSET_ADD=Add Option Set
 F_OPTIONSET_UPDATE=Update Option Set
 F_OPTIONSET_DELETE=Delete Option Set
+F_DATA_MART_ADMIN=Administrate data mart
+F_DV_ADMIN=Administrate data vizualiser
 
 #-- User module ---------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-02-13 19:27:46 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-02-17 19:42:53 +0000
@@ -275,11 +275,13 @@
       <param name="page">/dhis-web-reporting/viewDataMartForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/dataMart.js</param>
+      <param name="requiredAuthorities">F_DATA_MART_ADMIN</param>
 	</action>
 	
 	<action name="startExport" class="org.hisp.dhis.reporting.datamart.action.StartExportAction">
 	  <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_DATA_MART_ADMIN</param>
 	</action>
 	
 	<!-- Datamart CSV Export -->

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2012-02-12 14:40:54 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2012-02-17 19:42:53 +0000
@@ -10,7 +10,9 @@
 	<li><a href="displayPivotTableForm.action">$i18n.getString( "pivot_table" )&nbsp;</a></li>
 </ul>
 
+#if( $auth.hasAccess( "dhis-web-reporting", "displayDataMartForm" ) )
 <h2>$i18n.getString( "data_mart" )&nbsp;</h2>
 <ul>
 	<li><a href="displayDataMartForm.action">$i18n.getString( "data_mart" )&nbsp;</a></li>
-</ul>
\ No newline at end of file
+</ul>
+#end
\ No newline at end of file