From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 16 Jul 2018 13:42:39 +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=ed8bd2fa9a67d0c3951bc53d496b8cea63e8b886;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
index f8e45c0e..b3278797 100644
--- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+
+https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml
+
+ -->
+
 <zk>
 	<library-property>
 	    <name>org.zkoss.web.preferred.locale</name>
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index b9b484fe..ce2e8b40 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -62,7 +62,7 @@
 		.z-messagebox-window{ top:40% !important; width:30% !important; }
 	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
-		<timer id="timer" delay="500" repeats="true" onTimer="@command('uiTick')" />
+		<timer id="timer" delay="1" repeats="false" onTimer="@command('uiTick')" />
 		<borderlayout>
 			<west border="none" size="60%" splittable="true" minsize="500">
 				<div height="100%" width="100%">
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 93fb1c0a..4c1ae264 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
@@ -36,7 +36,7 @@ import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Row;
-import org.zkoss.zul.Rows;
+import org.zkoss.zul.Timer;
 import org.zkoss.zul.Window;
 
 import user.commons.ListUtils;
@@ -78,7 +78,7 @@ public class SearchModel extends AsyncBaseModel {
 	private boolean allSelected;
 	private boolean itemSelected;
 	@Wire
-	Rows rows;
+	Timer timer;
 	@Wire
 	Grid itemsGrid;
 	private String orderBy;
@@ -381,13 +381,14 @@ public class SearchModel extends AsyncBaseModel {
 	public void onAfterRenderGrid() {
 		registerTask(() -> {
 			logger.info("onAfterRenderGrid");
-			List<Component> children = rows.getChildren();
+			List<Component> children = itemsGrid.getRows().getChildren();
 			if (children.size() > 0) {
 				int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage();
 				Component top = children.get(pos);
 				Clients.scrollIntoView(top);
 			}
 		});
+		timer.start();
 	}
 
 	@Command
@@ -483,5 +484,6 @@ public class SearchModel extends AsyncBaseModel {
 			allChecked = check[0];
 			notifyChange("allChecked");
 		});
+		timer.start();
 	}
 }