dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14544
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-31 00:10:43 +0200
message:
  Data approval, fixed issue with delete
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  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/systemApprovalSettings.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/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-03-25 11:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-03-30 22:10:43 +0000
@@ -20,7 +20,7 @@
 intro_system_general_settings=Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more.
 intro_system_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page.
 intro_system_email_settings=Configure the email SMTP setup with regard to host name, user name and password.
-intro_system_approval_settings=Configure the levels at which data is approved.
+intro_system_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group.
 intro_system_access_settings=Configure access to the system, like which user role should be used for user self registration.
 system_general_settings=System General Settings
 system_appearance_settings=System Appearance Settings

=== 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-03-30 04:37:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-03-30 22:10:43 +0000
@@ -106,10 +106,10 @@
     </action>
 
     <action name="removeApprovalLevel" class="org.hisp.dhis.settings.action.system.RemoveApprovalLevelAction">
-      <result name="success" type="redirect">systemApprovalSettings.action</result>
-      <param name="page">/dhis-web-maintenance-settings/systemApprovalSettings.vm</param>
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+      <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
+      <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
-      <param name="onExceptionReturn">plainTextError</param>
     </action>
 
     <!-- Access settings -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm	2014-03-30 04:37:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm	2014-03-30 22:10:43 +0000
@@ -22,7 +22,7 @@
 <table class="mainPageTable">
     <tr>
         <td style="vertical-align:top">
-            <table width="100%">
+            <table width="75%">
                 <tr>
                     <td><div class="settingLabel">$i18n.getString( "data_approval_levels" )</div></td>
                     <td style="text-align:right">