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

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