From 18ebf559a0b75dc487c48a793e9089e4048d6781 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Mon, 7 Mar 2022 09:23:15 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33021

---
 server/-configuration/run-mediacube-server-hirtv.launch | 2 +-
 server/-configuration/run-mediacube-server-local.launch | 2 +-
 server/-configuration/run-mediacube-server-mv.launch    | 2 +-
 server/-configuration/run-mediacube-server-omar.launch  | 2 +-
 server/user.mediacube.gui/pages/searchitems.zul         | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 3c9d8e68..e616cf01 100644
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ b/server/-configuration/run-mediacube-server-hirtv.launch
@@ -100,7 +100,7 @@
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@default:default"/>
+        <setEntry value="user.jobengine.log4j@1:true"/>
         <setEntry value="user.jobengine.osgi.commons@default:true"/>
         <setEntry value="user.jobengine.osgi.db@default:default"/>
         <setEntry value="user.jobengine.osgi.server@default:default"/>
diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch
index a479b5dd..6b842065 100644
--- a/server/-configuration/run-mediacube-server-local.launch
+++ b/server/-configuration/run-mediacube-server-local.launch
@@ -111,7 +111,7 @@
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@default:default"/>
+        <setEntry value="user.jobengine.log4j@1:true"/>
         <setEntry value="user.jobengine.osgi.commons@default:true"/>
         <setEntry value="user.jobengine.osgi.db@default:default"/>
         <setEntry value="user.jobengine.osgi.server@default:default"/>
diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch
index 8efb4093..442bcae7 100644
--- a/server/-configuration/run-mediacube-server-mv.launch
+++ b/server/-configuration/run-mediacube-server-mv.launch
@@ -111,7 +111,7 @@
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@default:default"/>
+        <setEntry value="user.jobengine.log4j@1:true"/>
         <setEntry value="user.jobengine.osgi.commons@default:true"/>
         <setEntry value="user.jobengine.osgi.db@default:default"/>
         <setEntry value="user.jobengine.osgi.server@default:default"/>
diff --git a/server/-configuration/run-mediacube-server-omar.launch b/server/-configuration/run-mediacube-server-omar.launch
index 4ebacff2..3d55a3c3 100644
--- a/server/-configuration/run-mediacube-server-omar.launch
+++ b/server/-configuration/run-mediacube-server-omar.launch
@@ -111,7 +111,7 @@
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@default:default"/>
+        <setEntry value="user.jobengine.log4j@1:true"/>
         <setEntry value="user.jobengine.osgi.commons@default:true"/>
         <setEntry value="user.jobengine.osgi.db@default:default"/>
         <setEntry value="user.jobengine.osgi.server@default:default"/>
diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul
index ac99467a..84b3024f 100644
--- a/server/user.mediacube.gui/pages/searchitems.zul
+++ b/server/user.mediacube.gui/pages/searchitems.zul
@@ -4,7 +4,8 @@
 
 <!-- tag deklarációja -->
 <?component name="search-filters" inline="true" macroURI="searchitems/filters.zul"?>
-<?component name="search-results" inline="true" macroURI="searchitems/listresults.zul"?>
+<?component  name="search-results" if  inline="true" macroURI="searchitems/listresults.zul"?>
+<!-- <?component  name="search-results" if  inline="true" macroURI="searchitems/gridresults.zul"?> -->
 <?component name="item-details" inline="true" macroURI="searchitems/details.zul"?>
 
 <!DOCTYPE xml>
-- 
2.54.0