dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8903
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-06 20:22:22 +0700
message:
  Minor fix for Individual record menu.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.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-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-10-26 13:10:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-11-06 13:22:22 +0000
@@ -29,7 +29,7 @@
 #end
 
 #if( $auth.hasAccess( "dhis-web-caseentry", "reportSelect" ) 
-	&& $auth.hasAccess( "dhis-web-caseentry", "generateTabularReport" ) )	
+	|| $auth.hasAccess( "dhis-web-caseentry", "generateTabularReport" ) )	
 <h2>$i18n.getString( "reports" )&nbsp;</h2>
 #end
 <ul>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2012-05-24 10:58:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2012-11-06 13:22:22 +0000
@@ -1,8 +1,12 @@
 
 <a href="index.action"><h2>$i18n.getString( "reports" )&nbsp;</h2></a>
 <ul>
-    <li><a href="reportSelect.action">$i18n.getString( "program_summary" )&nbsp;</a></li>
-	<li><a href="app/index.html"> $i18n.getString( "tabular_report" )&nbsp;</a></li> 
+    #if( $auth.hasAccess( "dhis-web-caseentry", "reportSelect" ) )
+		<li><a href="reportSelect.action">$i18n.getString( "program_summary" )&nbsp;</a></li>
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "generateTabularReport" ) )
+		<li><a href="app/index.html"> $i18n.getString( "tabular_report" )&nbsp;</a></li> 
+	#end
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm	2012-09-12 09:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingMenu.vm	2012-11-06 13:22:22 +0000
@@ -1,8 +1,12 @@
 
 <a href="index.action"><h2>$i18n.getString( "tracking" )&nbsp;</h2></a>
 <ul>
-    <li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>  
-	<li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>     
+    #if( $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) )
+		<li><a href="activityPlanSelect.action">$i18n.getString( "activity_plan" )</a></li>  
+	#end
+	#if( $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) )
+		<li><a href="smsReminderSelect.action">$i18n.getString( "program_tracking" )</a></li>     
+	#end
 </ul>
 
 #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )