← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #12534

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3875: Put required authorities on section actions

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 3875
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-06-11 22:37:08 +0200
message:
  Put required authorities on section actions
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
  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/struts.xml
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js


--
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-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2011-06-01 03:46:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2011-06-11 20:37:08 +0000
@@ -53,11 +53,13 @@
 			<param name="page">/dhis-web-maintenance-dataset/addSection.vm</param>
 			<param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
 			<param name="javascripts">javascript/section.js</param>
+			<param name="requiredAuthorities">F_SECTION_ADD</param>
 		</action>
 
 		<action name="addSection"
 			class="org.hisp.dhis.dataset.action.section.AddSectionAction">
 			<result name="success" type="redirect">section.action</result>
+			<param name="requiredAuthorities">F_SECTION_ADD</param>
 		</action>
 
 		<action name="validateSection"
@@ -79,16 +81,19 @@
 			<param name="page">/dhis-web-maintenance-dataset/editSection.vm</param>
 			<param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
 			<param name="javascripts">javascript/section.js</param>
+			<param name="requiredAuthorities">F_SECTION_UPDATE</param>
 		</action>
 
 		<action name="updateSection"
 			class="org.hisp.dhis.dataset.action.section.UpdateSectionAction">
 			<result name="success" type="redirect">section.action</result>
+			<param name="requiredAuthorities">F_SECTION_UPDATE</param>
 		</action>
 
 		<action name="removeSection"
 			class="org.hisp.dhis.dataset.action.section.RemoveSectionAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+			<param name="requiredAuthorities">F_SECTION_DELETE</param>
 		</action>
 
 		<action name="greySection"
@@ -97,12 +102,14 @@
 			<param name="page">/dhis-web-maintenance-dataset/greySection.vm</param>
 			<param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
 			<param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
+			<param name="requiredAuthorities">F_SECTION_UPDATE</param>
 		</action>
 
 		<action name="saveSectionGreyStatus"
 			class="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction">
 			<result name="success" type="velocity">status.vm</result>
 			<result name="onExceptionReturn">plainTextError</result>
+			<param name="requiredAuthorities">F_SECTION_UPDATE</param>
 		</action>
 
 		<action name="showSortSectionForm"

=== 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	2011-06-11 19:51:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-06-11 20:37:08 +0000
@@ -55,6 +55,9 @@
 F_DATASET_ORDER_CHANGE = Change order in Data Set
 F_DATASET_UPDATE = Update Data Set
 F_DATASET_LOCK = Lock Data Set
+F_SECTION_ADD = Add Section
+F_SECTION_UPDATE = Update Section
+F_SECTION_DELETE = Delete Section
 F_DATAVALUE_ADD = Add Data Value
 F_DATAVALUE_DELETE = Delete Data Value
 F_DATAVALUE_UPDATE = Update Data Value

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2011-06-11 08:15:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2011-06-11 20:37:08 +0000
@@ -163,7 +163,6 @@
     <result name="success" type="velocity">/main.vm</result>
     <param name="page">/dhis-web-maintenance-user/userGroupList.vm</param>
     <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
-    <param name="stylesheets">css/receiveImportPage.css</param>
     <param name="javascripts">javascript/user.js</param>
 	<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
   </action>
@@ -178,20 +177,17 @@
     <param name="page">/dhis-web-maintenance-user/addUserGroupForm.vm</param>
     <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
     <param name="javascripts">javascript/user.js</param>
-    <param name="stylesheets">css/receiveImportPage.css</param>
   </action>
 
   <action name="addUserGroup" class="org.hisp.dhis.user.action.AddUserGroupAction">
     <param name="javascripts">javascript/user.js</param>
-    <result name="success" type="redirect">
-      getAllUserGroups.action</result>
+    <result name="success" type="redirect">getAllUserGroups.action</result>
   </action>
 
   <action name="editUserGroupForm" class="org.hisp.dhis.user.action.EditUserGroupFormAction">
     <result name="success" type="velocity">/main.vm</result>
     <param name="page">/dhis-web-maintenance-user/updateUserGroupForm.vm</param>
     <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
-    <param name="stylesheets">css/receiveImportPage.css</param>
   </action>
 
   <action name="updateUserGroup" class="org.hisp.dhis.user.action.UpdateUserGroupAction">

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml	2011-06-09 13:05:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml	2011-06-11 20:37:08 +0000
@@ -42,7 +42,7 @@
 
         <action name="getMapSystemSettings"
             class="org.hisp.dhis.mapping.action.GetMapSystemSettingsAction">
-            <result name="success" type="velocity-json">
+            <result name="success" type="velocity-javascript">
                 /dhis-web-mapping/jsGoogleKey.vm</result>
         </action>
 
@@ -384,7 +384,7 @@
 		<!-- i18n -->
 		
 		<action name="i18n" class="org.hisp.dhis.mapping.action.NoAction">
-            <result name="success" type="velocity">/dhis-web-mapping/i18n.vm</result>
+            <result name="success" type="velocity-javascript">/dhis-web-mapping/i18n.vm</result>
 		</action>
 
 	</package>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js	2010-12-27 00:21:07 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js	2011-06-11 20:37:08 +0000
@@ -30,7 +30,7 @@
     
     if ( type == 'success' )
     {
-    	setWaitMessage( "Analysing data, please wait..." );
+    	setWaitMessage( "Analysing data, please wait" );
     	
     	startDate = getFieldValue( 'startDate' );
     	endDate = getFieldValue( 'endDate' );
  Thread Previous • Date Previous • • Thread Next