From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 13 Jul 2018 09:34:19 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=7bfc43cde51589be1f13569bfa5cee70e12fe598;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31161
---

diff --git a/server/user.jobengine.osgi.server/pages/menu.zul b/server/user.jobengine.osgi.server/pages/menu.zul
index 86783571..89283a79 100644
--- a/server/user.jobengine.osgi.server/pages/menu.zul
+++ b/server/user.jobengine.osgi.server/pages/menu.zul
@@ -54,7 +54,7 @@
 		<menubar id="menubar" hflex="max" sclass="redmenubar">
 			<menu sclass="whitemenu" label="Archívum" >
 				<menupopup>
-					<menuitem sclass="rozsda" label="Keresés" onClick="@command('navigate', action='')" disabled="false" />
+					<menuitem sclass="rozsda" label="Keresés" onClick="@command('navigate', action='/')" disabled="false" />
 	 				<menuitem sclass="rozsda" label="Folyamatok" onClick="@command('navigate', action='jobs')" disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />
 	 				<menuitem sclass="rozsda" label="Hiányzó anyagok" onClick="@command('navigate', action='missingmaterials')" disabled="${not sessionScope.userPrincipal.submitter or sessionScope.userPrincipal.anonymous}" />
 				</menupopup>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
index a6a6c52f..16b6aa3a 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
@@ -118,6 +118,8 @@ public class IndexModel extends BaseModel {
 	}
 
 	public void route(String action, String query, boolean useQueryString) {
+		//		HttpServletRequest r = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
+		//		String pathInfo = r.getPathInfo();
 		String actionString = action == null ? "/" : action;
 		String page = (String) pathMap.get(actionString);
 		if (useQueryString && query != null)
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index b686def4..8ec7b570 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -149,8 +149,11 @@ public class SearchModel extends AsyncBaseModel {
 			Column column = (Column) child;
 			column.addEventListener("onSort", evt -> doSort(evt));
 		}
+
+		Object x = Executions.getCurrent().getNativeRequest();
+
 		//TODO
-		//? mediaID = Executions.getCurrent().getParameter("showMediaID")
+		String mediaID = Executions.getCurrent().getParameter("showMediaID");
 		// doSearchByMedia(mediaID)
 		// selectMediaArchive()
 
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
index 8c713091..b7ff5630 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
@@ -17,6 +17,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 
 import user.jobengine.server.IJobChangedListener;
 import user.jobengine.server.JobEngine;
+import user.jobengine.zk.model.IndexModel;
 
 public class SessionUtil {
 	private static Logger logger = LogManager.getLogger();
@@ -112,6 +113,7 @@ public class SessionUtil {
 	public static void logout() {
 		setAttribute(USERPRINCIPAL, null);
 		setAttribute(HISTORY, null);
+		setAttribute(IndexModel.class.getCanonicalName(), null);
 		cleanup();
 	}