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

diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
index 590f9ddccd6b961081852064b8bd960f168f47f6..b327879705ae93155090e51330223e0f5754c3ef 100644 (file)
--- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
@@ -25,9 +25,9 @@ https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml
        </system-config>\r
        \r
        \r
-       <listener>\r
-           <listener-class>user.jobengine.zk.util.LogEventInterceptor</listener-class>\r
-       </listener>     \r
+<!--   <listener> -->\r
+<!--       <listener-class>user.jobengine.zk.util.LogEventInterceptor</listener-class> -->\r
+<!--   </listener>      -->\r
 <!--   <listener> -->\r
 <!--         <description>Monitor the statistic</description> -->\r
 <!--         <listener-class>org.zkoss.zk.ui.util.Statistic</listener-class> -->\r

diff --git a/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul b/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul
index 75149595d508fca83013814589268ad1acf6b9cf..17f0adad7eca43271425ed608890a8fb637a0503 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul
+++ b/server/user.jobengine.osgi.server/pages/retrievebatchselector.zul
@@ -45,7 +45,8 @@
                        <row>\r
                                <cell colspan="2">\r
                                        <toolbar vflex="min" style="font-size:8px">\r
-                                               <toolbarbutton id="remove" image="/img/ic_remove_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('remove')" />\r
+                                               <toolbarbutton id="remove" image="/img/ic_remove_shopping_cart_black_18dp.png" autodisable="self" \r
+                                               onClick="@command('remove')" disabled="@load((jlm.selectedItems eq null) or (jlm.selectedItems.size() eq 0))" />\r
                                        </toolbar>\r
                                </cell>\r
                        </row>\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
index e687a0a21dc369b46bef451a8d73750590abc111..9b5fdca4f4f0cfd1c9ee0460b969a9b8db826da0 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
@@ -165,4 +165,8 @@ public class RetrieveBatchSelectorModel extends BaseModel {
                this.reloadTypes = reloadTypes;\r
        }\r
 \r
+       public void setSelectedItems(List<ArchivedMedia> selectedItems) {\r
+               this.selectedItems = selectedItems;\r
+       }\r
+\r
 }
\ No newline at end of file