dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8155
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-20 15:35:03 +0700
message:
  Fix small bug
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/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-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-08-13 10:06:08 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-09-20 08:35:03 +0000
@@ -25,6 +25,7 @@
       <result name="selectPeriod" type="redirect">
         /light/selectPeriod.action?organisationUnitId=${organisationUnitId}&amp;dataSetId=${dataSetId}
       </result>
+      <param name="requiredAuthorities">M_dhis-web-dataentry</param>
     </action>
 
     <action name="selectDataSet"
@@ -76,6 +77,7 @@
     <action name="trackingMenu" class="org.hisp.dhis.light.action.NoAction">
       <result name="success" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/trackingMenu.vm</param>
+      <param name="requiredAuthorities">M_dhis-web-maintenance-patient</param>
     </action>
     <action name="selectNamebasedOrganisationUnit"
         class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction">

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-09-19 09:01:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-09-20 08:35:03 +0000
@@ -20,26 +20,33 @@
 
 <p>
 <ul>
+	#set ( $trackingAuthority = false)
+	#set ( $aggregateAuthority = false)
+	
 	#foreach( $each in $user.getUserCredentials().getAllAuthorities() )
 		#if ( $each == 'ALL' )
-            <li><a href="selectOrganisationUnit.action">$i18n.getString( "agregate_reporting" )</a></li>
-            <li><a href="trackingMenu.action">$i18n.getString( "tracking" )</a></li>
-			#break
+			#set ($trackingAuthority = true)
+			#set ($aggregateAuthority = true)
         #else
-            
-            #if ( $each == 'M_dhis-web-maintenance-patient' )         
-				<li><a href="trackingMenu.action">$i18n.getString( "tracking" )</a></li>                
+            #if ( $each == 'M_dhis-web-maintenance-patient' )                       
+				#set ($trackingAuthority = true)
 			#end
 				
 			#if ( $each == 'M_dhis-web-dataentry' )              
-                <li><a href="selectOrganisationUnit.action">$i18n.getString( "agregate_reporting" )</a></li> 
+				#set ($aggregateAuthority = true)
 			#end
-            
 		#end
-	#end			
+	#end
+
+	#if ( $trackingAuthority == true )
+		<li><a href="trackingMenu.action">$i18n.getString( "tracking" )</a></li>
+	#end
+	#if ( $aggregateAuthority == true)
+		<li><a href="selectOrganisationUnit.action">$i18n.getString( "agregate_reporting" )</a></li>
+	#end	
     <li><a href="messages.action">$i18n.getString( "messages" ) #if($unreadMessageConversationCount > 0)($unreadMessageConversationCount)#end</a></li>
     <li><a href="reports.action">$i18n.getString( "reports" )</a></li>
-    <li><a href="settings.action">$i18n.getString( "settings" )</a></li>
+    <li><a href="settings.action">$i18n.getString( "settings" )</a></li>		
 </ul>
 </p>