dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14526
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-03-28 18:12:58 +0100
message:
  Add approval fix
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.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-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-02-19 14:05:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-03-28 17:12:58 +0000
@@ -86,10 +86,8 @@
     </action>
 
     <action name="addApprovalLevel" class="org.hisp.dhis.settings.action.system.AddApprovalLevelAction">
-      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="page">/dhis-web-maintenance-settings/systemApprovalSettings.vm</param>
+      <result name="success" type="redirect">systemApprovalSettings.action</result>
       <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
-      <param name="onExceptionReturn">plainTextError</param>
     </action>
 
     <action name="moveApprovalLevelDown" class="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm	2014-02-19 04:19:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm	2014-03-28 17:12:58 +0000
@@ -27,10 +27,12 @@
                 </select>
             </td>
         </tr>
+        <tr>
+        	<td></td>
+        	<td>
+        		<input type="submit" value="$i18n.getString( "add" )" style="width:10em" />
+                <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='systemApprovalSettings.action'" style="width:10em" />
+            </td>
+        </tr>
     </table>
 </form>
-
-<p>
-    <input type="submit" value="$i18n.getString( "add" )" style="width:10em" />
-    <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='systemApprovalSettings.action'" style="width:10em" />
-</p>