dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23505
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11447: persist filter/currentPage when doing add/edit on de, de-group, de-group-set, in, in-group, in-gr...
------------------------------------------------------------
revno: 11447
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-07-19 15:23:53 +0700
message:
persist filter/currentPage when doing add/edit on de, de-group, de-group-set, in, in-group, in-group-set, ds, user, user-group, etc
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm
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/webapp/dhis-web-maintenance-dataset/addDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
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/webapp/dhis-web-maintenance-user/addRoleForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.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-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-07-03 15:17:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-07-19 08:23:53 +0000
@@ -1,236 +1,224 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="dhis-web-commons.xml" />
-
- <package name="dhis-web-dashboard-integration" extends="dhis-web-commons"
- namespace="/dhis-web-dashboard-integration">
-
- <!-- Dashboard -->
-
- <action name="index" class="org.hisp.dhis.dashboard.action.InitAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/mainForm.vm</param>
- <param name="hideMenu">true</param>
- <param name="stylesheets">style/dashboard.css</param>
- <param name="javascripts">javascript/dashboard.js</param>
- </action>
-
- <action name="provideContent"
- class="org.hisp.dhis.dashboard.action.ProvideContentAction">
- <result name="success" type="velocity">/dhis-web-dashboard-integration/dashboard.vm
- </result>
- </action>
-
- <action name="setAreaItem" class="org.hisp.dhis.dashboard.action.SetAreaItemAction">
- <result name="success" type="velocity-xml">/dhis-web-dashboard-integration/responseSuccess.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="clearArea" class="org.hisp.dhis.dashboard.action.ClearAreaAction">
- <result name="success" type="velocity-xml">/dhis-web-dashboard-integration/responseSuccess.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="removeReport"
- class="org.hisp.dhis.dashboard.action.RemoveReportAction">
- <result name="success" type="redirect">index.action</result>
- </action>
-
- <action name="removeDocument"
- class="org.hisp.dhis.dashboard.action.RemoveDocumentAction">
- <result name="success" type="redirect">index.action</result>
- </action>
-
- <action name="removeReportTable"
- class="org.hisp.dhis.dashboard.action.RemoveReportTableAction">
- <result name="success" type="redirect">index.action</result>
- </action>
-
- <action name="removeMap"
- class="org.hisp.dhis.dashboard.action.RemoveMapViewAction">
- <result name="success" type="redirect">index.action</result>
- </action>
-
- <action name="search" class="org.hisp.dhis.dashboard.action.SearchAction">
- <result name="success" type="velocity">/dhis-web-dashboard-integration/hits.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <!-- Message -->
-
- <action name="message"
- class="org.hisp.dhis.dashboard.message.action.GetMessagesAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/message.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">javascript/message.js</param>
- <param name="stylesheets">style/dashboard.css</param>
- </action>
-
- <action name="sendMessage"
- class="org.hisp.dhis.dashboard.message.action.SendMessageAction">
- <result name="success" type="redirect">message.action</result>
- </action>
-
- <action name="sendFeedback"
- class="org.hisp.dhis.dashboard.message.action.SendFeedbackAction">
- <result name="success" type="redirect">message.action</result>
- </action>
-
- <action name="sendReply"
- class="org.hisp.dhis.dashboard.message.action.SendReplyAction">
- <result name="success" type="velocity-xml">/dhis-web-dashboard-integration/responseSuccess.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="showSendMessage"
- class="org.hisp.dhis.dashboard.message.action.GetMessageOptionsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/sendMessage.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js,../dhis-web-commons/select2/select2.min.js</param>
- <param name="stylesheets">style/dashboard.css,../dhis-web-commons/select2/select2.css</param>
- </action>
-
- <action name="showSendFeedback" class="org.hisp.dhis.dashboard.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/sendFeedback.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js</param>
- <param name="stylesheets">style/dashboard.css</param>
- </action>
-
- <action name="readMessage"
- class="org.hisp.dhis.dashboard.message.action.ReadMessageAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/readMessage.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">javascript/message.js</param>
- <param name="stylesheets">style/dashboard.css</param>
- </action>
-
- <action name="unreadMessage"
- class="org.hisp.dhis.dashboard.message.action.UnreadMessageAction">
- <result name="success" type="redirect">message.action?currentPage=${keyCurrentPage}
- </result>
- </action>
-
- <action name="removeMessage"
- class="org.hisp.dhis.dashboard.message.action.RemoveMessageAction">
- <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>
- </action>
-
- <action name="removeMessageRedirect"
- class="org.hisp.dhis.dashboard.message.action.RemoveMessageAction">
- <result name="success" type="redirect">message.action?currentPage=${keyCurrentPage}
- </result>
- </action>
-
- <action name="getMessageRecipients"
- class="org.hisp.dhis.dashboard.message.action.GetMessageRecipientsAction">
- <result name="success" type="velocity-json">/dhis-web-dashboard-integration/jsonMessageRecipients.vm
- </result>
- <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
-
- <action name="toggleFollowUp"
- class="org.hisp.dhis.dashboard.message.action.ToggleFollowUpAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <!-- Interpretation -->
-
- <action name="interpretation" class="org.hisp.dhis.dashboard.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/interpretation.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">javascript/interpretation.js</param>
- <param name="stylesheets">style/dashboard.css</param>
- </action>
-
- <action name="getInterpretations"
- class="org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction">
- <result name="success" type="velocity">/dhis-web-dashboard-integration/interpretationFeed.vm
- </result>
- </action>
-
- <!-- Profile -->
-
- <action name="profile"
- class="org.hisp.dhis.dashboard.profile.action.GetUserAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/profile.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">javascript/profile.js,javascript/interpretation.js</param>
- <param name="stylesheets">style/dashboard.css</param>
- </action>
-
- <!-- User Group -->
-
- <action name="getAllUserGroups"
- class="org.hisp.dhis.dashboard.usergroup.action.GetUserGroupListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/userGroupList.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- <param name="javascripts">javascript/usergroup.js</param>
- </action>
-
- <action name="getUserGroup"
- class="org.hisp.dhis.dashboard.usergroup.action.GetUserGroupAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonUserGroup.vm
- </result>
- </action>
-
- <action name="addUserGroupForm"
- class="org.hisp.dhis.dashboard.usergroup.action.AddUserGroupFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/addUserGroupForm.vm</param>
- <param name="javascripts">javascript/usergroup.js</param>
- </action>
-
- <action name="addUserGroup"
- class="org.hisp.dhis.dashboard.usergroup.action.AddUserGroupAction">
- <param name="javascripts">javascript/usergroup.js</param>
- <result name="success" type="redirect">getAllUserGroups.action</result>
- </action>
-
- <action name="editUserGroupForm"
- class="org.hisp.dhis.dashboard.usergroup.action.EditUserGroupFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-dashboard-integration/updateUserGroupForm.vm</param>
- </action>
-
- <action name="updateUserGroup"
- class="org.hisp.dhis.dashboard.usergroup.action.UpdateUserGroupAction">
- <result name="success" type="redirect">getAllUserGroups.action?currentPage=${keyCurrentPage}
- </result>
- </action>
-
- <action name="removeUserGroup"
- class="org.hisp.dhis.dashboard.usergroup.action.RemoveUserGroupAction">
- <result name="success" type="velocity">/dhis-web-commons/ajax/jsonResponseSuccess.vm
- </result>
- <result name="error" type="velocity">/dhis-web-commons/ajax/jsonResponseError.vm
- </result>
- </action>
-
- </package>
+ <include file="dhis-web-commons.xml" />
+
+ <package name="dhis-web-dashboard-integration" extends="dhis-web-commons"
+ namespace="/dhis-web-dashboard-integration">
+
+ <!-- Dashboard -->
+
+ <action name="index" class="org.hisp.dhis.dashboard.action.InitAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/mainForm.vm</param>
+ <param name="hideMenu">true</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ <param name="javascripts">javascript/dashboard.js</param>
+ </action>
+
+ <action name="provideContent"
+ class="org.hisp.dhis.dashboard.action.ProvideContentAction">
+ <result name="success" type="velocity">/dhis-web-dashboard-integration/dashboard.vm
+ </result>
+ </action>
+
+ <action name="setAreaItem" class="org.hisp.dhis.dashboard.action.SetAreaItemAction">
+ <result name="success" type="velocity-xml">/dhis-web-dashboard-integration/responseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="clearArea" class="org.hisp.dhis.dashboard.action.ClearAreaAction">
+ <result name="success" type="velocity-xml">/dhis-web-dashboard-integration/responseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="removeReport"
+ class="org.hisp.dhis.dashboard.action.RemoveReportAction">
+ <result name="success" type="redirect">index.action</result>
+ </action>
+
+ <action name="removeDocument"
+ class="org.hisp.dhis.dashboard.action.RemoveDocumentAction">
+ <result name="success" type="redirect">index.action</result>
+ </action>
+
+ <action name="removeReportTable"
+ class="org.hisp.dhis.dashboard.action.RemoveReportTableAction">
+ <result name="success" type="redirect">index.action</result>
+ </action>
+
+ <action name="removeMap"
+ class="org.hisp.dhis.dashboard.action.RemoveMapViewAction">
+ <result name="success" type="redirect">index.action</result>
+ </action>
+
+ <action name="search" class="org.hisp.dhis.dashboard.action.SearchAction">
+ <result name="success" type="velocity">/dhis-web-dashboard-integration/hits.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <!-- Message -->
+
+ <action name="message"
+ class="org.hisp.dhis.dashboard.message.action.GetMessagesAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/message.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">javascript/message.js</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ </action>
+
+ <action name="sendMessage"
+ class="org.hisp.dhis.dashboard.message.action.SendMessageAction">
+ <result name="success" type="redirect">message.action</result>
+ </action>
+
+ <action name="sendFeedback"
+ class="org.hisp.dhis.dashboard.message.action.SendFeedbackAction">
+ <result name="success" type="redirect">message.action</result>
+ </action>
+
+ <action name="sendReply"
+ class="org.hisp.dhis.dashboard.message.action.SendReplyAction">
+ <result name="success" type="velocity-xml">/dhis-web-dashboard-integration/responseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="showSendMessage"
+ class="org.hisp.dhis.dashboard.message.action.GetMessageOptionsAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/sendMessage.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js,../dhis-web-commons/select2/select2.min.js</param>
+ <param name="stylesheets">style/dashboard.css,../dhis-web-commons/select2/select2.css</param>
+ </action>
+
+ <action name="showSendFeedback" class="org.hisp.dhis.dashboard.action.NoAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/sendFeedback.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ </action>
+
+ <action name="readMessage"
+ class="org.hisp.dhis.dashboard.message.action.ReadMessageAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/readMessage.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">javascript/message.js</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ </action>
+
+ <action name="unreadMessage"
+ class="org.hisp.dhis.dashboard.message.action.UnreadMessageAction">
+ <result name="success" type="redirect">message.action?currentPage=${keyCurrentPage}
+ </result>
+ </action>
+
+ <action name="removeMessage"
+ class="org.hisp.dhis.dashboard.message.action.RemoveMessageAction">
+ <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>
+ </action>
+
+ <action name="removeMessageRedirect"
+ class="org.hisp.dhis.dashboard.message.action.RemoveMessageAction">
+ <result name="success" type="redirect">message.action?currentPage=${keyCurrentPage}
+ </result>
+ </action>
+
+ <action name="getMessageRecipients"
+ class="org.hisp.dhis.dashboard.message.action.GetMessageRecipientsAction">
+ <result name="success" type="velocity-json">/dhis-web-dashboard-integration/jsonMessageRecipients.vm
+ </result>
+ <result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+
+ <action name="toggleFollowUp"
+ class="org.hisp.dhis.dashboard.message.action.ToggleFollowUpAction">
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <!-- Interpretation -->
+
+ <action name="interpretation" class="org.hisp.dhis.dashboard.action.NoAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/interpretation.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">javascript/interpretation.js</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ </action>
+
+ <action name="getInterpretations"
+ class="org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction">
+ <result name="success" type="velocity">/dhis-web-dashboard-integration/interpretationFeed.vm
+ </result>
+ </action>
+
+ <!-- Profile -->
+
+ <action name="profile"
+ class="org.hisp.dhis.dashboard.profile.action.GetUserAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/profile.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">javascript/profile.js,javascript/interpretation.js</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ </action>
+
+ <!-- User Group -->
+
+ <action name="getAllUserGroups" class="org.hisp.dhis.dashboard.usergroup.action.GetUserGroupListAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/userGroupList.vm</param>
+ <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
+ <param name="javascripts">javascript/usergroup.js</param>
+ </action>
+
+ <action name="getUserGroup" class="org.hisp.dhis.dashboard.usergroup.action.GetUserGroupAction">
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonUserGroup.vm</result>
+ </action>
+
+ <action name="addUserGroupForm" class="org.hisp.dhis.dashboard.usergroup.action.AddUserGroupFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/addUserGroupForm.vm</param>
+ <param name="javascripts">javascript/usergroup.js</param>
+ </action>
+
+ <action name="addUserGroup" class="org.hisp.dhis.dashboard.usergroup.action.AddUserGroupAction">
+ <param name="javascripts">javascript/usergroup.js</param>
+ <result name="success" type="redirect">getAllUserGroups.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
+ </action>
+
+ <action name="editUserGroupForm" class="org.hisp.dhis.dashboard.usergroup.action.EditUserGroupFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/updateUserGroupForm.vm</param>
+ </action>
+
+ <action name="updateUserGroup" class="org.hisp.dhis.dashboard.usergroup.action.UpdateUserGroupAction">
+ <result name="success" type="redirect">getAllUserGroups.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
+ </action>
+
+ <action name="removeUserGroup" class="org.hisp.dhis.dashboard.usergroup.action.RemoveUserGroupAction">
+ <result name="success" type="velocity">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <result name="error" type="velocity">/dhis-web-commons/ajax/jsonResponseError.vm</result>
+ </action>
+
+ </package>
</struts>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm 2013-03-20 21:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/addUserGroupForm.vm 2013-07-19 08:23:53 +0000
@@ -82,7 +82,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='getAllUserGroups.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'getAllUserGroups.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm 2013-03-20 21:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/updateUserGroupForm.vm 2013-07-19 08:23:53 +0000
@@ -87,7 +87,7 @@
<p>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='getAllUserGroups.action'" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'getAllUserGroups.action' )" style="width:10em" />
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2013-07-18 05:21:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2013-07-19 08:23:53 +0000
@@ -154,7 +154,7 @@
</action>
<action name="addDataElementGroup" class="org.hisp.dhis.dd.action.dataelementgroup.AddDataElementGroupAction">
- <result name="success" type="redirect">dataElementGroup.action</result>
+ <result name="success" type="redirect">dataElementGroup.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
</action>
@@ -166,7 +166,7 @@
</action>
<action name="updateDataElementGroup" class="org.hisp.dhis.dd.action.dataelementgroup.UpdateDataElementGroupAction">
- <result name="success" type="redirect">dataElementGroup.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">dataElementGroup.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
@@ -198,7 +198,7 @@
</action>
<action name="addDataElementGroupSet" class="org.hisp.dhis.dd.action.dataelementgroupset.AddDataElementGroupSetAction">
- <result name="success" type="redirect">dataElementGroupSet.action</result>
+ <result name="success" type="redirect">dataElementGroupSet.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_DATAELEMENTGROUPSET_PUBLIC_ADD, F_DATAELEMENTGROUPSET_PRIVATE_ADD</param>
</action>
@@ -211,7 +211,7 @@
</action>
<action name="updateDataElementGroupSet" class="org.hisp.dhis.dd.action.dataelementgroupset.UpdateDataElementGroupSetAction">
- <result name="success" type="redirect">dataElementGroupSet.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">dataElementGroupSet.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_DATAELEMENTGROUPSET_UPDATE</param>
</action>
@@ -251,8 +251,7 @@
</action>
<action name="saveIndicatorSortOrder" class="org.hisp.dhis.dd.action.indicator.SaveIndicatorSortOrderAction">
- <result name="success" type="redirect">indicator.action
- </result>
+ <result name="success" type="redirect">indicator.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
</action>
<action name="removeIndicator" class="org.hisp.dhis.dd.action.indicator.RemoveIndicatorAction">
@@ -274,7 +273,7 @@
</action>
<action name="addIndicator" class="org.hisp.dhis.dd.action.indicator.AddIndicatorAction">
- <result name="success" type="redirect">indicator.action</result>
+ <result name="success" type="redirect">indicator.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_INDICATOR_PUBLIC_ADD, F_INDICATOR_PRIVATE_ADD</param>
</action>
@@ -286,7 +285,7 @@
</action>
<action name="updateIndicator" class="org.hisp.dhis.dd.action.indicator.UpdateIndicatorAction">
- <result name="success" type="redirect">indicator.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">indicator.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_INDICATOR_UPDATE</param>
</action>
@@ -374,7 +373,7 @@
</action>
<action name="addIndicatorGroup" class="org.hisp.dhis.dd.action.indicatorgroup.AddIndicatorGroupAction">
- <result name="success" type="redirect">indicatorGroup.action</result>
+ <result name="success" type="redirect">indicatorGroup.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
</action>
@@ -386,7 +385,7 @@
</action>
<action name="updateIndicatorGroup" class="org.hisp.dhis.dd.action.indicatorgroup.UpdateIndicatorGroupAction">
- <result name="success" type="redirect">indicatorGroup.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">indicatorGroup.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
@@ -408,7 +407,7 @@
</action>
<action name="addIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.AddIndicatorGroupSetAction">
- <result name="success" type="redirect">indicatorGroupSet.action</result>
+ <result name="success" type="redirect">indicatorGroupSet.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_INDICATORGROUPSET_PUBLIC_ADD, F_INDICATORGROUPSET_PRIVATE_ADD</param>
</action>
@@ -420,7 +419,7 @@
</action>
<action name="updateIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.UpdateIndicatorGroupSetAction">
- <result name="success" type="redirect">indicatorGroupSet.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">indicatorGroupSet.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_INDICATORGROUPSET_UPDATE</param>
</action>
@@ -463,7 +462,7 @@
</action>
<action name="addIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.AddIndicatorTypeAction">
- <result name="success" type="redirect">indicatorType.action</result>
+ <result name="success" type="redirect">indicatorType.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_INDICATORTYPE_ADD</param>
</action>
@@ -475,7 +474,7 @@
</action>
<action name="updateIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.UpdateIndicatorTypeAction">
- <result name="success" type="redirect">indicatorType.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">indicatorType.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_INDICATORTYPE_UPDATE</param>
</action>
@@ -499,19 +498,13 @@
</action>
<action name="getDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.GetDataDictionaryAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-datadictionary/jsonDataDictionary.vm
- </result>
+ <result name="success" type="velocity-json">/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="removeDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.RemoveDataDictionaryAction">
- <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>
+ <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_DATADICTIONARY_DELETE</param>
</action>
@@ -550,17 +543,13 @@
</action>
<action name="addDataElementCategory" class="org.hisp.dhis.dd.action.category.AddDataElementCategoryAction">
- <result name="success" type="redirect">category.action</result>
+ <result name="success" type="redirect">category.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
</action>
<action name="validateDataElementCategory" class="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryAction">
- <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>
+ <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>
</action>
@@ -571,14 +560,12 @@
</action>
<action name="getDataElementCategory" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonDataElementCategory.vm
- </result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementCategory.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="updateDataElementCategory" class="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryAction">
- <result name="success" type="redirect">category.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">category.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
</action>
@@ -590,38 +577,34 @@
</action>
<action name="removeDataElementCategory" class="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryAction">
- <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>
+ <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_DATAELEMENT_DELETE</param>
</action>
<!-- CategoryOption -->
- <action name="categoryOption" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionListAction">
+ <action name="categoryOption" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
</action>
-
+
<action name="showAddDataElementCategoryOptionForm" class="org.hisp.dhis.dd.action.concept.GetConceptListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm</param>
<param name="javascripts">javascript/categoryOption.js</param>
<param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
</action>
-
+
<action name="addDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.AddDataElementCategoryOptionAction">
- <result name="success" type="redirect">categoryOption.action</result>
+ <result name="success" type="redirect">categoryOption.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
</action>
- <action name="showUpdateDataElementCategoryOptionForm" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionAction">
+ <action name="showUpdateDataElementCategoryOptionForm" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm</param>
<param name="javascripts">javascript/category.js</param>
@@ -629,21 +612,17 @@
</action>
<action name="updateDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryOptionAction">
- <result name="success" type="redirect">categoryOption.action</result>
+ <result name="success" type="redirect">categoryOption.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
</action>
<action name="removeDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryOptionAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm
- </result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="requiredAuthorities">F_DATAELEMENT_DELETE</param>
</action>
-
+
<action name="getDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryOptionAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonDataElementCategoryOption.vm
- </result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -657,17 +636,13 @@
</action>
<action name="addDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.AddDataElementCategoryComboAction">
- <result name="success" type="redirect">categoryCombo.action</result>
+ <result name="success" type="redirect">categoryCombo.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
</action>
<action name="validateDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.ValidateDataElementCategoryComboAction">
- <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>
+ <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>
</action>
@@ -679,14 +654,12 @@
</action>
<action name="getDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonCategoryCombo.vm
- </result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonCategoryCombo.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="updateDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.UpdateDataElementCategoryComboAction">
- <result name="success" type="redirect">categoryCombo.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">categoryCombo.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
</action>
@@ -698,12 +671,8 @@
</action>
<action name="removeDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.RemoveDataElementCategoryComboAction">
- <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>
+ <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_DATAELEMENT_DELETE</param>
</action>
@@ -722,29 +691,21 @@
<!-- Validate CategoryOption -->
<action name="validateDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryOptionAction">
- <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>
+ <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>
</action>
<!-- Concept Name -->
<action name="getConcept" class="org.hisp.dhis.dd.action.concept.GetConceptAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonConcept.vm
- </result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonConcept.vm</result>
</action>
<action name="concept" class="org.hisp.dhis.dd.action.concept.GetConceptListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="page">
- /dhis-web-maintenance-datadictionary/multidimensional/concept.vm
- </param>
+ <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/concept.vm</param>
<param name="javascripts">javascript/concept.js</param>
<param name="requiredAuthorities">F_CONCEPT_MANAGEMENT</param>
</action>
@@ -752,9 +713,7 @@
<action name="showAddConceptForm" class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="page">
- /dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm
- </param>
+ <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm</param>
<param name="javascripts">javascript/concept.js</param>
<param name="requiredAuthorities">F_CONCEPT_ADD</param>
</action>
@@ -762,42 +721,32 @@
<action name="showUpdateConceptForm" class="org.hisp.dhis.dd.action.concept.GetConceptAction">
<result name="success" type="velocity">/main.vm</result>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
- <param name="page">
- /dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm
- </param>
+ <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm</param>
<param name="javascripts">javascript/concept.js</param>
<param name="requiredAuthorities">F_CONCEPT_UPDATE</param>
</action>
<action name="validateAddUpdateConcept" class="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction">
- <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>
+ <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>
</action>
<action name="addConcept" class="org.hisp.dhis.dd.action.concept.AddConceptAction">
- <result name="success" type="redirect">concept.action</result>
+ <result name="success" type="redirect">concept.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<result name="error" type="redirect">index.action</result>
<param name="requiredAuthorities">F_CONCEPT_ADD</param>
</action>
<action name="updateConceptInstance" class="org.hisp.dhis.dd.action.concept.UpdateConceptAction">
- <result name="success" type="redirect">concept.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">concept.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<result name="error" type="redirect">index.action</result>
<param name="requiredAuthorities">F_CONCEPT_UPDATE</param>
</action>
<action name="removeConcept" class="org.hisp.dhis.dd.action.concept.RemoveConceptAction">
- <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>
+ <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_CONCEPT_DELETE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2013-03-16 05:57:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm 2013-07-19 08:23:53 +0000
@@ -135,7 +135,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataDictionary.action'" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataDictionary.action' )" style="width:10em" />
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2013-03-01 04:09:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm 2013-07-19 08:23:53 +0000
@@ -87,7 +87,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroup.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataElementGroup.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2013-02-04 15:02:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm 2013-07-19 08:23:53 +0000
@@ -90,7 +90,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroupSet.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataElementGroupSet.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2013-03-16 05:57:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2013-07-19 08:23:53 +0000
@@ -131,7 +131,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicator.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicator.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm 2013-03-16 05:57:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm 2013-07-19 08:23:53 +0000
@@ -86,7 +86,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorGroup.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicatorGroup.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2013-03-16 05:57:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm 2013-07-19 08:23:53 +0000
@@ -88,7 +88,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorGroupSet.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicatorGroupSet.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm 2012-10-17 11:58:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm 2013-07-19 08:23:53 +0000
@@ -28,7 +28,7 @@
<td></td>
<td>
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorType.action'" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicatorType.action' )" style="width:10em" />
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 2011-04-11 14:03:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm 2013-07-19 08:23:53 +0000
@@ -26,7 +26,7 @@
<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='concept.action'" style="width:10em"/></td>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'concept.action' )" style="width:10em"/></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm 2013-04-22 10:06:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm 2013-07-19 08:23:53 +0000
@@ -100,7 +100,7 @@
<p>
<input type="submit" name="add" value="$i18n.getString( 'add' )" style="width:10em" />
- <input type="button" name="cancel" onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( 'cancel' )" style="width:10em" />
+ <input type="button" name="cancel" onclick="dhis2.commons.redirectCurrentPage( 'categoryCombo.action' )" value="$i18n.getString( 'cancel' )" style="width:10em" />
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2013-04-22 17:22:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2013-07-19 08:23:53 +0000
@@ -106,7 +106,7 @@
<p>
<input type="submit" value="$i18n.getString( 'add' )" style="width:100px">
- <input type="button" onclick="window.location.href='category.action'" value="$i18n.getString( 'cancel' )" style="width:100px"/>
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'category.action' )" value="$i18n.getString( 'cancel' )" style="width:100px"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm 2013-04-22 10:01:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm 2013-07-19 08:23:53 +0000
@@ -44,7 +44,7 @@
<td></td>
<td colspan="3">
<input type="submit" value="$i18n.getString( 'add' )" style="width:100px">
- <input type="button" onclick="window.location.href='categoryOption.action'" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'categoryOption.action' )" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 2011-04-11 14:03:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm 2013-07-19 08:23:53 +0000
@@ -30,7 +30,7 @@
<tr>
<td></td>
<td><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='concept.action'" style="width:10em"/></td>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'concept.action' )" style="width:10em"/></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm 2013-04-22 10:06:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm 2013-07-19 08:23:53 +0000
@@ -110,7 +110,7 @@
<p>
<input type="submit" name="update" value="$i18n.getString( 'update' )" style="width:10em" />
- <input type="button" name="cancel" onclick="window.location.href='categoryCombo.action'" value="$i18n.getString( 'cancel' )" style="width:10em" />
+ <input type="button" name="cancel" onclick="dhis2.commons.redirectCurrentPage( 'categoryCombo.action' )" value="$i18n.getString( 'cancel' )" style="width:10em" />
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2013-04-22 17:22:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2013-07-19 08:23:53 +0000
@@ -119,7 +119,7 @@
<p>
<input type="submit" value="$i18n.getString( 'save' )" style="width:100px"/>
- <input type="button" onclick="window.location.href='category.action'" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'category.action' )" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm 2013-04-22 10:01:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm 2013-07-19 08:23:53 +0000
@@ -52,7 +52,7 @@
<td></td>
<td colspan="3">
<input type="submit" value="$i18n.getString( 'save' )" style="width:100px"/>
- <input type="button" onclick="window.location.href='categoryOption.action'" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'categoryOption.action' )" value="$i18n.getString( 'cancel' )" style="width:100px"/></p>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2013-02-12 06:55:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm 2013-07-19 08:23:53 +0000
@@ -144,7 +144,7 @@
<p>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataDictionary.action'" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataDictionary.action' )" style="width:10em" />
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2013-03-01 04:09:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm 2013-07-19 08:23:53 +0000
@@ -105,7 +105,7 @@
<p>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroup.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataElementGroup.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2013-04-30 08:12:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm 2013-07-19 08:23:53 +0000
@@ -97,7 +97,7 @@
<p>
<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElementGroupSet.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'dataElementGroupSet.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2013-02-07 10:25:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2013-07-19 08:23:53 +0000
@@ -131,7 +131,7 @@
<p>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicator.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicator.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm 2013-02-07 10:25:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm 2013-07-19 08:23:53 +0000
@@ -89,7 +89,7 @@
<p>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorGroup.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicatorGroup.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2013-02-07 10:25:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm 2013-07-19 08:23:53 +0000
@@ -93,7 +93,7 @@
<p>
<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorGroupSet.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicatorGroupSet.action' )" style="width:10em"/>
</p>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm 2012-10-17 11:58:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm 2013-07-19 08:23:53 +0000
@@ -37,7 +37,7 @@
<td></td>
<td>
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='indicatorType.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'indicatorType.action' )" style="width:10em"/>
</td>
</tr>
</table>
=== 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 2013-01-21 14:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2013-07-19 08:23:53 +0000
@@ -139,12 +139,12 @@
</action>
<action name="addDataSet" class="org.hisp.dhis.dataset.action.AddDataSetAction">
- <result name="success" type="redirect">dataSet.action</result>
+ <result name="success" type="redirect">dataSet.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="anyAuthorities">F_DATASET_PUBLIC_ADD, F_DATASET_PRIVATE_ADD</param>
</action>
<action name="updateDataSet" class="org.hisp.dhis.dataset.action.UpdateDataSetAction">
- <result name="success" type="redirect">dataSet.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">dataSet.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<param name="requiredAuthorities">F_DATASET_UPDATE</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-07-08 09:42:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2013-07-19 08:23:53 +0000
@@ -263,7 +263,7 @@
<tr>
<td colspan="3">
<input type="submit" value="$i18n.getString( 'save' )" style="width:120px" />
- <input type="button" onclick="window.location.href='dataSet.action'" value="$i18n.getString( 'cancel' )" style="width:120px" />
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'dataSet.action' )" value="$i18n.getString( 'cancel' )" style="width:120px" />
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-07-08 09:42:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2013-07-19 08:23:53 +0000
@@ -271,7 +271,7 @@
<tr>
<td colspan="3">
<input type="submit" value="$i18n.getString( 'save' )" style="width:120px" />
- <input type="button" onclick="window.location.href='dataSet.action'" value="$i18n.getString( 'cancel' )" style="width:120px" />
+ <input type="button" onclick="dhis2.commons.redirectCurrentPage( 'dataSet.action' )" value="$i18n.getString( 'cancel' )" style="width:120px" />
</td>
</tr>
=== 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 2013-03-20 20:12:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml 2013-07-19 08:23:53 +0000
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
<include file="dhis-web-commons.xml" />
<package name="dhis-web-maintenance-user" extends="dhis-web-commons" namespace="/dhis-web-maintenance-user">
-
+
<!-- User -->
<action name="index" class="org.hisp.dhis.user.action.NoAction">
@@ -29,12 +29,11 @@
<param name="page">/dhis-web-maintenance-user/allUser.vm</param>
<param name="menu">/dhis-web-maintenance-user/menu.vm</param>
<param name="javascripts">javascript/user.js,javascript/filterTable.js</param>
- <param name="requiredAuthorities">F_USER_VIEW</param>
+ <param name="requiredAuthorities">F_USER_VIEW</param>
</action>
<action name="getUser" class="org.hisp.dhis.user.action.GetUserAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonUser.vm</result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonUser.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -54,7 +53,7 @@
</action>
<action name="addUser" class="org.hisp.dhis.user.action.AddUserAction">
- <result name="success" type="redirect">user.action</result>
+ <result name="success" type="redirect">user.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<result name="error" type="redirect">showAddUserForm.action</result>
<param name="requiredAuthorities">F_USER_ADD</param>
</action>
@@ -67,8 +66,8 @@
</action>
<action name="updateUser" class="org.hisp.dhis.user.action.UpdateUserAction">
- <result name="success" type="redirect">user.action</result>
- <result name="error" type="redirect">showUpdateUserForm.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">user.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
+ <result name="error" type="redirect">showUpdateUserForm.action</result>
<param name="requiredAuthorities">F_USER_UPDATE</param>
</action>
@@ -77,14 +76,14 @@
<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
-
+
<action name="disableUser" class="org.hisp.dhis.user.action.DisableUserAction">
<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>
</action>
-
- <!-- PDF -->
+
+ <!-- PDF -->
<action name="exportToPdf" class="org.hisp.dhis.user.action.pdf.ExportToPdfAction">
<result name="success" type="stream">
@@ -94,7 +93,7 @@
<param name="bufferSize">10240</param>
</result>
</action>
-
+
<!-- Role -->
<action name="allRole" class="org.hisp.dhis.user.action.GetRoleListAction">
@@ -106,8 +105,7 @@
</action>
<action name="getRole" class="org.hisp.dhis.user.action.GetRoleAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonUserRole.vm</result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonUserRole.vm</result>
<param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_USERROLE_LIST</param>
</action>
@@ -128,7 +126,7 @@
</action>
<action name="addRole" class="org.hisp.dhis.user.action.AddRoleAction">
- <result name="success" type="redirect">allRole.action</result>
+ <result name="success" type="redirect">allRole.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
<result name="error" type="redirect">showAddRoleForm.action</result>
<param name="requiredAuthorities">F_USERROLE_ADD</param>
</action>
@@ -141,8 +139,8 @@
</action>
<action name="updateRole" class="org.hisp.dhis.user.action.UpdateRoleAction">
- <result name="success" type="redirect">allRole.action</result>
- <result name="error" type="redirect">showUpdateRoleForm.action?currentPage=${keyCurrentPage}</result>
+ <result name="success" type="redirect">allRole.action?currentPage=${keyCurrentPage}&key=${keyCurrentKey}</result>
+ <result name="error" type="redirect">showUpdateRoleForm.action</result>
<param name="requiredAuthorities">F_USERROLE_UPDATE</param>
</action>
@@ -163,10 +161,9 @@
</action>
<!-- Json Actions -->
-
+
<action name="getSystemAuthorities" class="org.hisp.dhis.user.action.GetSystemAuthoritiesAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-user/ajax/jsonSystemAuthorities.vm</result>
+ <result name="success" type="velocity-json">/dhis-web-maintenance-user/ajax/jsonSystemAuthorities.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2013-07-17 22:19:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2013-07-19 08:23:53 +0000
@@ -103,7 +103,7 @@
<td></td>
<td valign="top">
<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='allRole.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'allRole.action' )" style="width:10em"/>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2013-03-22 11:59:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm 2013-07-19 08:23:53 +0000
@@ -17,7 +17,7 @@
jQuery( "#cancel" ).click( function()
{
- referrerBack( "alluser.action" );
+ dhis2.commons.redirectCurrentPage( 'alluser.action' );
} );
jQuery("#availableList").dhisAjaxSelect({
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2013-07-17 22:19:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2013-07-19 08:23:53 +0000
@@ -114,7 +114,7 @@
<td></td>
<td valign="top">
<input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
- <input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='allRole.action'" style="width:10em"/>
+ <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'allRole.action' )" style="width:10em"/>
</td>
<td></td>
<td></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2012-10-17 19:06:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2013-07-19 08:23:53 +0000
@@ -19,7 +19,7 @@
jQuery( "#cancel" ).click( function()
{
- referrerBack( "alluser.action" );
+ dhis2.commons.redirectCurrentPage( 'alluser.action' );
} );
jQuery("#availableList").dhisAjaxSelect({
