← Back to team overview

dhis2-devs team mailing list archive

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

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16250: Validation rule group, consistent action naming

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 16250
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-07-26 21:08:32 +0200
message:
  Validation rule group, consistent action naming
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.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-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2014-07-26 19:04:03 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2014-07-26 19:08:32 +0000
@@ -81,7 +81,7 @@
 
     <!-- ValidationRuleGroup CRUD operations -->
 
-    <action name="showValidationRuleGroupForm"
+    <action name="validationRuleGroup"
       class="org.hisp.dhis.validationrule.action.validationrulegroup.GetValidationRuleGroupListAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/validationRuleGroup.vm</param>
@@ -109,7 +109,7 @@
     </action>
 
     <action name="addValidationRuleGroup" class="org.hisp.dhis.validationrule.action.validationrulegroup.AddValidationRuleGroupAction">
-      <result name="success" type="redirect">showValidationRuleGroupForm.action</result>
+      <result name="success" type="redirect">validationRuleGroup.action</result>
       <param name="anyAuthorities">F_VALIDATIONRULEGROUP_PUBLIC_ADD, F_VALIDATIONRULEGROUP_PRIVATE_ADD</param>
     </action>
 
@@ -123,7 +123,7 @@
 
     <action name="updateValidationRuleGroup"
       class="org.hisp.dhis.validationrule.action.validationrulegroup.UpdateValidationRuleGroupAction">
-      <result name="success" type="redirect">showValidationRuleGroupForm.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
+      <result name="success" type="redirect">validationRuleGroup.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <param name="anyAuthorities">F_VALIDATIONRULEGROUP_PUBLIC_ADD, F_VALIDATIONRULEGROUP_PRIVATE_ADD</param>
     </action>
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm	2014-03-28 01:51:34 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm	2014-07-26 19:08:32 +0000
@@ -115,7 +115,7 @@
 
     <p>
 	<input type="submit" value="$i18n.getString( "add" )" style="width:10em" />
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='showValidationRuleGroupForm.action'" style="width:10em" />
+	<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='validationRuleGroup.action'" style="width:10em" />
 </p>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2013-10-08 19:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm	2014-07-26 19:08:32 +0000
@@ -2,7 +2,7 @@
 
 <ul class="introList">
     #introListImgItem( "validationRule.action" "validation_rule" "validationrule" )
-    #introListImgItem( "showValidationRuleGroupForm.action" "validation_rule_group" "validationrule" )
+    #introListImgItem( "validationRuleGroup.action" "validation_rule_group" "validationrule" )
     #introListImgItem( "showRunValidationForm.action" "validation_rule_analysis" "validationanalysis" )
     #introListImgItem( "viewAnalysisForm.action?key=stddevoutlier" "stddevoutlier_analysis" "validationanalysis" )
     #introListImgItem( "viewAnalysisForm.action?key=minmaxoutlier" "minmaxoutlier_analysis" "validationanalysis" )

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm	2013-10-08 19:10:40 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm	2014-07-26 19:08:32 +0000
@@ -2,7 +2,7 @@
 <h2>$i18n.getString( "validation_rule" )&nbsp;</h2>
 <ul>
 	<li><a href="validationRule.action">$i18n.getString( "validation_rule" )&nbsp;</a></li>
-	<li><a href="showValidationRuleGroupForm.action">$i18n.getString( "validation_rule_group" )&nbsp;</a></li>
+	<li><a href="validationRuleGroup.action">$i18n.getString( "validation_rule_group" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "data_analysis" )&nbsp;</h2>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2014-07-26 19:04:03 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2014-07-26 19:08:32 +0000
@@ -126,7 +126,7 @@
 
 <p>
 	<input type="submit" value="$i18n.getString( "save" )" style="width:10em" />
-	<input type="button" value="$i18n.getString( "cancel" )" onclick="dhis2.commons.redirectCurrentPage( 'showValidationRuleGroupForm.action' )" style="width:10em" />
+	<input type="button" value="$i18n.getString( "cancel" )" onclick="dhis2.commons.redirectCurrentPage( 'validationRuleGroup.action' )" style="width:10em" />
 </p>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm	2014-06-13 08:33:45 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm	2014-07-26 19:08:32 +0000
@@ -31,7 +31,7 @@
         <td style="vertical-align:top">
 			<table width="100%">
 				<tr>
-          <td>#filterDiv( "showValidationRuleGroupForm" )</td>
+          <td>#filterDiv( "validationRuleGroup" )</td>
           <td colspan="3" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddValidationRuleGroupForm.action'"></td>
         </tr>
 			</table>
  Thread Previous • Date Previous • • Thread Next