From: rkv <rkv@opencascade.com>
Date: Thu, 18 Apr 2013 05:37:49 +0000 (+0000)
Subject: Fix of wrong search results after logout.
X-Git-Tag: Root_Delivery2_2013_04_22~19
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=285d6ede657df4c887920757f5986448afab4796;p=tools%2Fsiman.git

Fix of wrong search results after logout.
---

diff --git a/Workspace/Siman/src/org/splat/simer/AbstractSearchBaseAction.java b/Workspace/Siman/src/org/splat/simer/AbstractSearchBaseAction.java
index a2c12dc..0ddb11e 100644
--- a/Workspace/Siman/src/org/splat/simer/AbstractSearchBaseAction.java
+++ b/Workspace/Siman/src/org/splat/simer/AbstractSearchBaseAction.java
@@ -24,6 +24,8 @@ import org.splat.wapp.Constants;
 /**
  * Base search action class used for searching studies and knowledge.
  * 
+ * @param <FilterClass>
+ *            search filter class
  * @author <a href="mailto:roman.kozlov@opencascade.com">Roman Kozlov (RKV)</a>
  */
 public abstract class AbstractSearchBaseAction<FilterClass extends SearchFilterDTO>
diff --git a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
index 484e354..4970e14 100644
--- a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
@@ -108,6 +108,7 @@ public class ConnectionAction extends Action {
 				if (logged.canContributeToStudy() || logged.canValidate()) {
 					// TODO: Set the search filter according to user preferences
 					Map<String, Object> session = getSession();
+					session.remove(AbstractSearchBaseAction.RESULT_KEY); // The current result is obsolete
 					// Map<String,Object> kfilter = (Map<String, Object>)session.get("knowledge.filter");
 					Map<String, Object> sfilter = (Map<String, Object>) session
 							.get("study.filter");
@@ -152,6 +153,7 @@ public class ConnectionAction extends Action {
 		try {
 			Map<String, Object> session = getSession();
 			// Map<String,Object> kfilter = (Map<String, Object>)session.get("knowledge.filter");
+			session.remove(AbstractSearchBaseAction.RESULT_KEY); // The current result is obsolete
 			Map<String, Object> sfilter = (Map<String, Object>) session
 					.get("study.filter");
 			LoginContext context = (LoginContext) session.get("login.context");
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index d3ced39..12a20f3 100644
--- 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>