Update uses list functionality

[tools/siman.git] / Workspace / Siman / src / struts.xml

diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index d3ced39ead3c860d17d154c28ed5763eba1aed03..add83ea64d212facfac6f3b4c59e174557c5c3d2 100644 (file)
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -115,7 +115,9 @@
                        method="logout">
                        <result name="none" type="tiles">page.home</result>
                        <result name="create" type="tiles">page.home</result>
-                       <result name="open" type="tiles">page.home</result>
+                       <result name="open" type="redirectAction">
+                               select?menu=search
+                       </result>
                        <result name="study" type="tiles">page.home</result>
                        <result name="knowledge" type="tiles">page.home</result>
                        <result name="datadmin" type="tiles">page.home</result>
@@ -188,7 +190,8 @@
                </action>
                <action name="valid-new" class="newStudyAction"
                        method="create">
-                       <!--interceptor-ref name="siman-validation" /-->
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
                        <result name="success" type="redirectAction">
                                open-study?selection=0.1
                        </result>
@@ -204,6 +207,8 @@
         </action>
         <action name="valid-copy" class="copyStudyAction"
             method="create">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
             <result name="success" type="redirectAction">
                 open-study?selection=0.1
             </result>
@@ -220,6 +225,15 @@
                        </result>
                        <result name="error" type="tiles">page.home</result>
                </action>
+               <action name="setStudyOrder" class="searchStudyAction"
+                   method="setOrder">
+            <result name="success" type="tiles">
+                page.searchstudy
+            </result>
+            <result name="error" type="tiles">
+                page.searchstudy
+            </result>
+               </action>
                <action name="refresh-study" class="searchStudyAction"
                        method="submitForm">
                        <result name="selectype" type="tiles">
@@ -240,6 +254,15 @@
                                page.searchknowledge
                        </result>
                </action>
+               <action name="setKnowledgeOrder" class="searchKnowledgeAction"
+            method="setOrder">
+            <result name="success" type="tiles">
+                page.searchknowledge
+            </result>
+            <result name="error" type="tiles">
+                page.searchknowledge
+            </result>
+        </action>
                <action name="refresh-knowledge" class="searchKnowledgeAction"
                        method="submitForm">
                        <result name="selectype" type="tiles">
@@ -268,6 +291,7 @@
                        <result name="success" type="tiles">
                                page.displaystudy
                        </result>
+            <result name="error" type="tiles">page.home</result>
                </action>
                <action name="step-study" class="displayStudyStepAction"
                        method="selectStep">
@@ -358,15 +382,23 @@
                                page.displaystudy
                        </result>
                </action>
-               
                <action name="valid-rename" class="editScenarioPropertiesAction"
                        method="editScenarioTitle">
                        <interceptor-ref name="simanBasicStack" />
+            <interceptor-ref name="siman-validation" />
                        <result name="success" type="redirectAction">
                                open-study
                        </result>
                </action>
-               
+               <action name="remove-scenario" class="editScenarioPropertiesAction"
+            method="removeScenario">
+            <result name="success" type="redirectAction">
+                open-study
+            </result>
+            <result name="error" type="redirectAction">
+                step-study
+            </result>
+        </action>      
                <action name="add-scenario" class="newScenarioAction"
                        method="initialize">
                        <result name="success" type="tiles">
@@ -399,16 +431,20 @@
                </action>
                <action name="valid-add" class="newScenarioAction"
                        method="create">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
                        <result name="cancel" type="redirectAction">
                                step-study
                        </result>
                        <result name="success" type="redirectAction">
-                               step-study
+                               open-study
                        </result>
                        <result name="error" type="tiles">page.displaystudy</result>
                </action>
                <action name="valid-edit" class="studyPropertiesAction"
                        method="edition">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="validation"/>
                        <result name="success" type="tiles">
                                page.editstudyproperties
                        </result>
@@ -510,13 +546,18 @@
                        </result>
                        <result name="error" type="tiles">page.importerror</result>
                </action>
+               <action name="update-uses" class="importDocumentAction"
+                       method="updateUsesList">
+                       <result name="success"  type="dispatcher">
+                               /study/usesList.jsp
+                       </result>
+               </action>
                <action name="valid-import" class="importDocumentAction"
                        method="import">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
                        <result name="success" type="redirectAction">
-                               step-study
-                       </result>
-                       <result name="cancel" type="redirectAction">
-                               step-study
+                               open-study
                        </result>
                        <result name="error" type="tiles">page.importerror</result>
                </action>
@@ -529,6 +570,8 @@
                </action>
                <action name="valid-version" class="versionDocumentAction"
                        method="version">
+                       <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
                        <result name="success" type="redirectAction">
                                step-study
                        </result>
@@ -586,6 +629,8 @@
                </action>
                <action name="setKnowledge" class="editKnowledgeElementAction"
                        method="setKnowledge">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="validation"/>
                        <result name="success" type="redirectAction">
                 study/open-study
             </result>