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

diff --git a/server/user.jobengine.osgi.server/pages/menu.zul b/server/user.jobengine.osgi.server/pages/menu.zul
index 8678357165e6477f18cb40065538e8d8a9316d22..89283a79c8d57ced8686c0873363a6036a8298fb 100644 (file)
--- 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">\r
                        <menu sclass="whitemenu" label="Archívum" >\r
                                <menupopup>\r
-                                       <menuitem sclass="rozsda" label="Keresés" onClick="@command('navigate', action='')" disabled="false" />\r
+                                       <menuitem sclass="rozsda" label="Keresés" onClick="@command('navigate', action='/')" disabled="false" />\r
                                        <menuitem sclass="rozsda" label="Folyamatok" onClick="@command('navigate', action='jobs')" disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
                                        <menuitem sclass="rozsda" label="Hiányzó anyagok" onClick="@command('navigate', action='missingmaterials')" disabled="${not sessionScope.userPrincipal.submitter or sessionScope.userPrincipal.anonymous}" />\r
                                </menupopup>\r

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 a6a6c52fd6e6a34db06fd3c6bc8a34b68a842ff9..16b6aa3a163ca03874b753bd8e1ca47f36cf18dd 100644 (file)
--- 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 {
        }\r
 \r
        public void route(String action, String query, boolean useQueryString) {\r
+               //              HttpServletRequest r = (HttpServletRequest) Executions.getCurrent().getNativeRequest();\r
+               //              String pathInfo = r.getPathInfo();\r
                String actionString = action == null ? "/" : action;\r
                String page = (String) pathMap.get(actionString);\r
                if (useQueryString && query != null)\r

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 b686def412abc52c8300cc9277fa81d02a4cd8d9..8ec7b570186346fffaaedc741be5a88e99dabcd8 100644 (file)
--- 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;\r
                        column.addEventListener("onSort", evt -> doSort(evt));\r
                }\r
+\r
+               Object x = Executions.getCurrent().getNativeRequest();\r
+\r
                //TODO\r
-               //? mediaID = Executions.getCurrent().getParameter("showMediaID")\r
+               String mediaID = Executions.getCurrent().getParameter("showMediaID");\r
                // doSearchByMedia(mediaID)\r
                // selectMediaArchive()\r
 \r

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 8c713091698dac984e7698ca42de31d22d2f506f..b7ff5630c5b32f622842aa9f065015063f195f90 100644 (file)
--- 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;
 \r
 import user.jobengine.server.IJobChangedListener;\r
 import user.jobengine.server.JobEngine;\r
+import user.jobengine.zk.model.IndexModel;\r
 \r
 public class SessionUtil {\r
        private static Logger logger = LogManager.getLogger();\r
@@ -112,6 +113,7 @@ public class SessionUtil {
        public static void logout() {\r
                setAttribute(USERPRINCIPAL, null);\r
                setAttribute(HISTORY, null);\r
+               setAttribute(IndexModel.class.getCanonicalName(), null);\r
                cleanup();\r
        }\r
 \r