From: mka <mka@opencascade.com>
Date: Mon, 13 May 2013 12:39:38 +0000 (+0000)
Subject: Cancel operation work correctly in the case of empty title of the document on the... 
X-Git-Tag: Delivery_V1_0_2013_07_12~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c2a1d1bab3c4d09906af8a85c32c61c58384826;p=tools%2Fsiman.git

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

diff --git a/Workspace/Siman/WebContent/study/importDocument.jsp b/Workspace/Siman/WebContent/study/importDocument.jsp
index 899b182..3a715bd 100644
--- 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 70b7623..77713cb 100644
--- 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 9df9d00..0c56648 100644
--- 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"