From 2bf3c2c13b483db0e88b70b582850f821775a292 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Fri, 10 Sep 2021 07:22:57 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32331

---
 server/user.mediacube.gui/pages/edithistory.zul  | 16 ++--------------
 .../jobengine/zk/model/EditHistoryModel.java     |  6 ++++++
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/server/user.mediacube.gui/pages/edithistory.zul b/server/user.mediacube.gui/pages/edithistory.zul
index c9f80479..72e4f03e 100644
--- a/server/user.mediacube.gui/pages/edithistory.zul
+++ b/server/user.mediacube.gui/pages/edithistory.zul
@@ -14,20 +14,8 @@
 
 			</auxheader>
 		</auxhead>
-		<columns sizable="true">
-			<column forEach="${vm.columnList}" label="${each.label}" sort="auto(${each.name})"></column>
-		</columns>
-		<rows>
-			<template name="model" var="r">
-				<row>
-					<label forEach="${vm.columnList}" value="${r.get(each.name)}"></label>
-				</row>
-			</template>
-		</rows>
-	</grid>
-	<grid model="@load(vm.dataList)" vflex="true" hflex="true" emptyMessage="Nincs adat!">
-		<columns sizable="true">
-			<column forEach="${vm.columnList}" label="${each.label}" sort="auto(${each.name})"></column>
+		<columns sizable="true" menupopup="auto" draggable="true">
+			<column forEach="${vm.columnList}" label="${each.label}" sort="auto(${each.name})" ></column>
 		</columns>
 		<rows>
 			<template name="model" var="r">
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/EditHistoryModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/EditHistoryModel.java
index 58660304..c76b041a 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/EditHistoryModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/EditHistoryModel.java
@@ -39,6 +39,7 @@ public class EditHistoryModel {
 			Col r = new Col();
 			r.put("name", name);
 			r.put("label", label);
+			r.put("visible", true);
 			return r;
 		}
 	}
@@ -92,6 +93,11 @@ public class EditHistoryModel {
 		qbFilter.and(qbEnd.get());
 
 		List<BasicDBObject> dataSource = ListUtils.cast(collection.find(qbFilter.get()).toArray());
+		//		dataList = dataSource;
+		//		BindUtils.postNotifyChange(null, null, this, "dataList");
+
+		//		if (dataList != null)
+		//			return;
 
 		statistics = new HashMap<>();
 		for (BasicDBObject data : dataSource) {
-- 
2.54.0