From: Omar Sweidan <omar.sweidan@userrendszerhaz.hu>
Date: Tue, 28 Jun 2022 07:51:39 +0000 (+0200)
Subject: demo videó nem betöltése, visszaállás GridSearchModel-re
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=08dc23711654c478d2e9b048d99576ed39e0cb50;p=mediacube.git

demo videó nem betöltése, visszaállás GridSearchModel-re
---

diff --git a/server/user.mediacube.gui/pages/jobeditor2.zul b/server/user.mediacube.gui/pages/jobeditor2.zul
index 1ad0bd68..89db33a7 100644
--- a/server/user.mediacube.gui/pages/jobeditor2.zul
+++ b/server/user.mediacube.gui/pages/jobeditor2.zul
@@ -118,8 +118,8 @@
 								<label height="100%" ca:data-syntax-highlight="true" multiline="true" pre="true" 
 									value="@bind(jem2.editingJob['xml'])" />
 							</tabpanel>
-							<tabpanel>
-								<include src="/pages/processVisualizer2.zul" />
+							<tabpanel>								
+								<include src="/pages/processVisualizer2.zul" />			
 							</tabpanel>
 						</tabpanels>
 					</tabbox>
diff --git a/server/user.mediacube.gui/pages/jobs.zul b/server/user.mediacube.gui/pages/jobs.zul
index e1e9bcb1..97d559b9 100644
--- a/server/user.mediacube.gui/pages/jobs.zul
+++ b/server/user.mediacube.gui/pages/jobs.zul
@@ -15,9 +15,9 @@
 			<tabpanel>
 				<include src="/pages/jobeditor.zul"/>
 			</tabpanel>
-			<tabpanel>
- 				<include src="/pages/jobeditor2.zul" />
-			</tabpanel>
+<!-- 			<tabpanel> -->
+<!--  				<include src="/pages/jobeditor2.zul" /> -->
+<!-- 			</tabpanel> -->
 		</tabpanels>
 	</tabbox>
 </zk>
\ No newline at end of file
diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul
index 2e575a1b..bc238a1b 100644
--- a/server/user.mediacube.gui/pages/searchitems.zul
+++ b/server/user.mediacube.gui/pages/searchitems.zul
@@ -3,7 +3,7 @@
 
 <!-- tag deklarációja -->
 <?component name="search-filters" inline="true" macroURI="searchitems/filters.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>
@@ -36,7 +36,7 @@
 
 	<!-- csak igy jo a list sebessege -->
 
-	<div id="scdiv" width="100%" height="100%" viewModel="@id('vm') @init('user.jobengine.zk.model.ListSearchModel')">
+	<div id="scdiv" width="100%" height="100%" viewModel="@id('vm') @init('user.jobengine.zk.model.GridSearchModel')">
 		<timer id="timer" delay="500" repeats="false" onTimer="@command('uiTick')" />
 		<div id="tagListener" onChange="@command('onTagChanged')" />
 
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
index b1df74ac..4391d7e9 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
@@ -215,7 +215,7 @@ public class ListSearchModel extends AsyncBaseModel {
 		// Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4',
 		// 'video/mp4')");
 		logger.info("afterCompose");
-		Clients.evalJavaScript("setSource('https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8', 'application/x-mpegURL', 100)");
+//		Clients.evalJavaScript("setSource('https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8', 'application/x-mpegURL', 100)");
 
 		try {
 			Selectors.wireComponents(view, this, false);