Cancel operation work correctly in the case of empty title of the document on the...

diff --git a/Workspace/Siman/WebContent/study/importDocument.jsp b/Workspace/Siman/WebContent/study/importDocument.jsp
index 899b182f8cc16bbfb66ba051ac39a4644170de44..3a715bd7935ef3dd4e1c9f807feb1346eae3a020 100644 (file)
--- a/Workspace/Siman/WebContent/study/importDocument.jsp
+++ b/Workspace/Siman/WebContent/study/importDocument.jsp
@@ -101,8 +101,11 @@ $(document).ready(function () {
                <td></td>
        </tr>
        <tr>
-               <td align="right"><s:submit theme="simple" name="cancel"
-                       key="button.cancel" />&nbsp;</td>
+               <td align="right">
+                       <s:a action="step-study">
+                <button type='button'><s:text name="button.cancel"/></button>
+            </s:a>&nbsp;
+               </td>
                <td align="left"><s:submit theme="simple" name="save"
                        key="button.import" /> <s:select theme="simple" id="documentState"
                        name="documentState" list="documentStates" listKey="value"

diff --git a/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java b/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
index 70b76234b13b363c7d32adeedb291d9a1a2b69ef..77713cbf5a4e1d1e42c5d5ef121d62ff2bccc5f0 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
@@ -212,9 +212,7 @@ public class ImportDocumentAction extends BaseUploadDocumentAction {
                initializationScreenContext(Constants.STUDY_MENU, Constants.STUDY_MENU,
                                Constants.TRUE);
 
-               if (_action == ToDo.cancel) {
-                       res = "cancel";
-               } else if (_documentType == 0) {
+               if (_documentType == 0) {
                        setErrorCode("message.error.import.type");
 
                        initializationFullScreenContext(Constants.STUDY_MENU,

diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 9df9d0019fd060be573dd3eae76d17db3876a41b..0c566488fef3084f234f57c9e0060f01f06a76c1 100644 (file)
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -273,6 +273,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">
@@ -527,9 +528,6 @@
                        <result name="success" type="redirectAction">
                                step-study
                        </result>
-                       <result name="cancel" type="redirectAction">
-                               step-study
-                       </result>
                        <result name="error" type="tiles">page.importerror</result>
                </action>
                <action name="version-document" class="versionDocumentAction"