diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-04-03 12:30:30 +0200 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-04-03 12:30:30 +0200 |
| commit | a4a715f1124282e202fb2e56f874a8c1a5e2bd71 (patch) | |
| tree | 2c43e82874507646e1a31d3b5f1077c2f76cc141 /id/ConfigWebTool/src/main/resources | |
| parent | 996c5877797949948fbb709d8b2dfc420eda8ddd (diff) | |
| parent | f69a970246ff82e7d08c96430b2a281416df4d15 (diff) | |
| download | moa-id-spss-a4a715f1124282e202fb2e56f874a8c1a5e2bd71.tar.gz moa-id-spss-a4a715f1124282e202fb2e56f874a8c1a5e2bd71.tar.bz2 moa-id-spss-a4a715f1124282e202fb2e56f874a8c1a5e2bd71.zip | |
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into vidp_2.1_bs
Diffstat (limited to 'id/ConfigWebTool/src/main/resources')
| -rw-r--r-- | id/ConfigWebTool/src/main/resources/applicationResources_en.properties | 6 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/resources/struts.xml | 30 |
2 files changed, 15 insertions, 21 deletions
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties index 5e116a974..4163cbc37 100644 --- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties +++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties @@ -57,7 +57,7 @@ webpages.edit.export=Export webpages.inportexport.import.header=MOA-ID 2.x configuration webpages.inportexport.import.upload=Import configuration webpages.inportexport.import.download=Export configuration -webpages.inportexport.descripten=WARNING\: The imported configuration will completely replace currently active configuration! +webpages.inportexport.descripten=WARNING\: The imported configuration will completely replace currently active configuration\! webpages.usermanagement.newuser=Create new user webpages.usermanagement.header=User management @@ -291,8 +291,8 @@ webpages.oaconfig.vidp.ap.list=List of configured attribute providers message.title=Announcement: -webpages.oaconfig.success=The Online-Application {0} could not be saved. -webpages.oaconfig.success.admin=Online-Applikation {0} could not be saved. The activation by the Administrator is necessary. +webpages.oaconfig.success=The Online-Application {0} could be saved. +webpages.oaconfig.success.admin=Online-Applikation {0} could be saved. The activation by the Administrator is necessary. webpages.oaconfig.cancle=The processing of Online-Applikation {0} was interrupted. webpages.oaconfig.delete.message=Online-Application {0} was succesfully removed. diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml index 0a2039ced..4b006ffd9 100644 --- a/id/ConfigWebTool/src/main/resources/struts.xml +++ b/id/ConfigWebTool/src/main/resources/struts.xml @@ -8,6 +8,8 @@ <constant name="struts.custom.i18n.resources" value="webpages" /> <constant name="struts.mapper.action.prefix.enabled" value="true" /> <constant name="struts.mapper.action.prefix.crossNamespaces" value="false" /> + <constant name="struts.xwork.chaining.copyErrors" value="true"/> + <constant name="struts.xwork.chaining.copyMessages" value="true"/> <package name="default" namespace="/" extends="struts-default"> @@ -15,14 +17,12 @@ <interceptors> <interceptor-stack name="OwnStack"> -<!-- <interceptor-ref name="params"> + <interceptor-ref name="params"> <param - name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param> - </interceptor-ref> - <interceptor-ref name="i18n"> - </interceptor-ref> --> - <interceptor-ref name="defaultStack" /> - </interceptor-stack> + name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param> + </interceptor-ref> + <interceptor-ref name="defaultStack" /> + </interceptor-stack> </interceptors> <default-interceptor-ref name="OwnStack"/> @@ -34,12 +34,7 @@ </result> <interceptor-ref name="OwnStack"/> </action> - - <action name="changeLanguage" method="changeLanguage" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction"> - <result name="success" type="chain">index</result> - <interceptor-ref name="OwnStack"/> - </action> - + <action name="authenticate" method="authenticate" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction"> <result name="success" type="redirectAction"> <param name="actionName">main</param> @@ -91,14 +86,13 @@ <interceptors> <interceptor-stack name="OwnStack"> - <interceptor-ref name="defaultStack" /> <interceptor-ref name="params"> <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param> - </interceptor-ref> - <interceptor-ref name="i18n"> - </interceptor-ref> - </interceptor-stack> + </interceptor-ref> + <interceptor-ref name="chain"/> + <interceptor-ref name="defaultStack" /> + </interceptor-stack> </interceptors> <default-interceptor-ref name="OwnStack"/> |