From 37b795e6841625decf687dc37ab73c065e7f6ce5 Mon Sep 17 00:00:00 2001 From: "vasary.daniel" Date: Tue, 20 Apr 2021 18:13:01 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32216 --- .../user/jobengine/db/BreakDAO_SJProfile0.ser | Bin 3253 -> 3253 bytes .../db/DomainCategoryDAO_SJProfile0.ser | Bin 2552 -> 2552 bytes .../jobengine/db/DomainDAO_SJProfile0.ser | Bin 4043 -> 4043 bytes .../db/DomainIndexDAO_SJProfile0.ser | Bin 3143 -> 3143 bytes .../jobengine/db/EntityBaseDAO_SJProfile0.ser | Bin 2286 -> 2286 bytes .../jobengine/db/FileTypeDAO_SJProfile0.ser | Bin 3872 -> 3872 bytes .../jobengine/db/FolderDAO_SJProfile0.ser | Bin 2479 -> 2479 bytes .../jobengine/db/HelperDAO_SJProfile0.ser | Bin 1674 -> 1674 bytes .../user/jobengine/db/ItemDAO_SJProfile0.ser | Bin 4337 -> 4337 bytes .../jobengine/db/ItemTypeDAO_SJProfile0.ser | Bin 2933 -> 2933 bytes .../user/jobengine/db/JobDAO_SJProfile0.ser | Bin 5413 -> 5413 bytes .../db/JobParametersDAO_SJProfile0.ser | Bin 2355 -> 2355 bytes .../jobengine/db/MasterIdDAO_SJProfile0.ser | Bin 1655 -> 1655 bytes .../generated/user/jobengine/db/MediaDAO.java | 32 +++++++++--------- .../user/jobengine/db/MediaDAO_SJProfile0.ser | Bin 5058 -> 5098 bytes .../jobengine/db/MediaFileDAO_SJProfile0.ser | Bin 4725 -> 4725 bytes .../jobengine/db/MetadataDAO_SJProfile0.ser | Bin 6747 -> 6747 bytes .../db/MetadataElementDAO_SJProfile0.ser | Bin 2990 -> 2990 bytes .../db/MetadataTypeDAO_SJProfile0.ser | Bin 3013 -> 3013 bytes .../db/RemoteStoreDAO_SJProfile0.ser | Bin 3178 -> 3178 bytes .../db/SceneContentDAO_SJProfile0.ser | Bin 3376 -> 3376 bytes .../user/jobengine/db/SceneDAO_SJProfile0.ser | Bin 2973 -> 2973 bytes .../db/SearchDefinitionDAO_SJProfile0.ser | Bin 3528 -> 3528 bytes .../user/jobengine/db/ShotDAO_SJProfile0.ser | Bin 3487 -> 3487 bytes .../user/jobengine/db/StoreDAO_SJProfile0.ser | Bin 3164 -> 3164 bytes .../jobengine/db/StoreUriDAO_SJProfile0.ser | Bin 4756 -> 4756 bytes .../jobengine/db/UserInfoDAO_SJProfile0.ser | Bin 3637 -> 3637 bytes .../db/WorkflowActionDAO_SJProfile0.ser | Bin 4737 -> 4737 bytes .../src/user/jobengine/db/MediaDAO.sqlj | 12 +++---- .../pages/metadatadetails.zul | 2 +- .../pages/searchitems/details.zul | 4 --- .../zk/model/MetadataDetailsModel.java | 10 ++++++ .../user/jobengine/zk/model/SearchModel.java | 17 +++++++--- 33 files changed, 46 insertions(+), 31 deletions(-) diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser index 1b8cd5efbc88b640aff35edfcbdbc3bf312a0690..47bc6d9e7cecee3c7b73ca3aa152b29a8d227365 100644 GIT binary patch delta 16 Xcmdlgxm9ulA0zWtAD+#Ej7zuyE*=En delta 16 Xcmdlgxm9ulA0zW}2hYudj7zuyF31G~ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser index 21e71cc4a7b5c9596417e348f1500946549a1482..c45cfa54e51a7c44cd84574daab0c8981d676605 100644 GIT binary patch delta 16 Xcmew%{6lyHA0zWtpRCP-jL$g$I0psz delta 16 Ycmew%{6lyHA0zW}hv}OI8J}|i060+w3jhEB diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser index f9206ac0d9a2163ade966fec12c41567632b12aa..bcbb788c046bc4f29b7125cb6851253254f046b8 100644 GIT binary patch delta 16 YcmX>te_DP6A0zWtpY@vs8F%pk05w|$)Bpeg delta 16 YcmX>te_DP6A0zW}hm)HH8F%pk05vlO)Bpeg diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser index de9d7df20bfd3a48a3f8712f5a6e6d6ba0116376..e8cf325deeb8d2c96c810fa49b7d9ae17078520b 100644 GIT binary patch delta 16 XcmX>uaa>{pA0zWtpSzm{8O^u>G$;jS delta 16 XcmX>uaa>{pA0zW}hcBB28O^u>Gwuaq diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser index dad2100aab91f898d0904bee61062fb9a4814e6d..26cf3cfd04c5cbf38049d08e74c84de844fefdb1 100644 GIT binary patch delta 16 YcmaDS_)c&GA0zWtpC_9I8Skwu- delta 16 XcmZ1=w?J+KA0zW}N4L#_jQo56E35=h diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser index 5f3d51e7bf5f72da78960ac8376e729bc287456e..1e9b8447faa4455c160997a50b97af12dc72c420 100644 GIT binary patch delta 16 XcmZ24yk2+%A0zWtU!%=}jPp1EEuIAC delta 16 XcmZ24yk2+%A0zW}$H2{kjPp1EEtCZ7 diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser index ab0eeacec76644a754e00b6080574dedffa2c01b..b621d807aee6ecdcbcefa293d71040702b8dd9b5 100644 GIT binary patch delta 16 XcmeC;?c&|Q$H=_Z*KD&OV7 delta 16 Xcmew=_El^HA0zW}$2pq?8B@3bH*5uv diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser index 1d85834351e252548daaf9926e23df014422bb3a..7dec0bec46599519867060dd3d4a0f3197051feb 100644 GIT binary patch delta 16 XcmZ3gwNz^ZA0zWt-$|PV8AU_@FfIh* delta 16 XcmZ3gwNz^ZA0zW}#~qsm8AU_@Fir&S diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser index 4402c87929f91bed9cf5427c58e76c334a08544a..226a3ff8eb28c5eb1426d03bf7ee9713f6a3b821 100644 GIT binary patch delta 16 Xcmdliv{`5aA0zWt-&val8I?EyFLDIf delta 16 Xcmdliv{`5aA0zW}$0M5s8I?EyFRBFS diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser index dd8c65ed9cf866aa691c06a6923c5cc315b15ded..f331a910d93641b9311bd70a83b6b0fa4854818e 100644 GIT binary patch delta 16 Xcmey)^POh{A0zWt-#MEF8Piw+H&X?d delta 16 Xcmey)^POh{A0zW}$77oX8Piw+H;V(); @@ -201,7 +201,7 @@ class MediaDAO extends EntityBaseDAO { /*@lineinfo:generated-code*//*@lineinfo:80^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ID = :id }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ID = :id }; // ************************************************************ { @@ -226,7 +226,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:80^156*/ +/*@lineinfo:user-code*//*@lineinfo:80^166*/ return iter; } @@ -236,7 +236,7 @@ class MediaDAO extends EntityBaseDAO { /*@lineinfo:generated-code*//*@lineinfo:87^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ITEMID = :id }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ITEMID = :id }; // ************************************************************ { @@ -261,7 +261,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:87^160*/ +/*@lineinfo:user-code*//*@lineinfo:87^170*/ return iter; } @@ -270,7 +270,7 @@ class MediaDAO extends EntityBaseDAO { /*@lineinfo:generated-code*//*@lineinfo:93^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE TITLE = :title }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE TITLE = :title }; // ************************************************************ { @@ -295,7 +295,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:93^162*/ +/*@lineinfo:user-code*//*@lineinfo:93^172*/ return iter; } @@ -305,7 +305,7 @@ class MediaDAO extends EntityBaseDAO { /*@lineinfo:generated-code*//*@lineinfo:100^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA }; // ************************************************************ { @@ -329,7 +329,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:100^141*/ +/*@lineinfo:user-code*//*@lineinfo:100^151*/ return iter; } diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser index af7204410c7542ba314eac99864fe3c6fd629f1c..1c50053578455c4b36e4853c27ccb4082be246c2 100644 GIT binary patch delta 224 zcmX@4{z`oVA0zWt-@Tg!8C_TyJ2!{1ZepCQ#V$J8fK!~Wgn=WuC^fMpGe56{p=WY7 zXF8XTf^(3oV~D4}-{h6-zKp$_zq7kD^8Nq+|8F5f9fJjku$*kbDa~SC!Y~0{$0g1{ s#-7b8Twb_z^rPw6%*0cJOKmN>S|PswjEokWg#^Nw7%etu3Pmyk0JIK92><{9 delta 177 zcmaE*en@=-A0zW}#}AtY8C_Ty>oOL6A0zWt-)ox%8B+uSI~xWE delta 16 XcmeyW@>OL6A0zW}C$7zcj46TuHI@Y; diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser index 1f4279941120f51285b0881aaeb4784c8e2fe51b..9274bb7582025c4af8f7f79e4dab45cc5ffa14d3 100644 GIT binary patch delta 16 Xcmca@a@%ABA0zWt-%pzb8NDO{I!gup delta 16 Xcmca@a@%ABA0zW}C)Le@j9!ueG{6NH diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser index 08fdd9d6269a217e7f65ac74af1a29997d1fc366..1f5f78fe1d009da60c7b11dc12f816d6155093c0 100644 GIT binary patch delta 16 XcmZ1{zD|4tA0zWtKaS0UjB~jFEc*n+ delta 16 XcmZ1{zD|4tA0zW}C#%hZjB~jFEn@`S diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser index f46ecd846ce66031bbba3cdb195cceed9a3e38ea..3a1ed9b2f6b6cf6e295cd53a4f2dcd17e4ea5724 100644 GIT binary patch delta 16 XcmX>qepGw|A0zWtKmN^vj9a(>Fa-q= delta 16 XcmX>qepGw|A0zW}C&$f#j9a(>Fl_}W diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser index aca192d35a0078e202d7149ac67b6a3c865d4264..ab0580c12708fded082a1fe7e5386ab82539f103 100644 GIT binary patch delta 16 XcmaDQ@k(L?A0zWtKc&rrjFH>`G&BVj delta 16 XcmaDQ@k(L?A0zW}r|`{!jFH>`G_D0O diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser index bcdbafc304416ca95274adba16827c96ed730585..490e48fd25d96011c21a42806aa14044c6de57b1 100644 GIT binary patch delta 16 XcmdlWwLxkFA0zWtKeNq(jPg7HEu{p2 delta 16 XcmdlWwLxkFA0zW}r`*kgjPg7HE-M6` diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser index 4fe84ae7ae851ef8746c5dac5fb1048b0dfb3255..cad6efeae01b27bbd4fb0482cc6c45f52e9f618c 100644 GIT binary patch delta 16 XcmbO$K39ALA0zWtKcCHlj6GZcEOP|a delta 16 XcmbO$K39ALA0zW}r>4zheL{KzA0zWtzqHMQjN5qtGT{Y! delta 16 YcmX>heL{KzA0zW}r#YJi8MpHQ05f3)mH+?% diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser index e01b8e100f539fea464d30402cd639f38736084c..c6dc75586fc40b65fce42888bb3d60c093ebf1fe 100644 GIT binary patch delta 16 XcmbO)JzshQA0zWtzmCm? delta 16 Xcmca3aYteUA0zW}r^A~C8NImyHFgDZ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser index 7dca9ba07cbd60294721ecaa3259fd324eb58cdc..7b493860db149ab06ace7b4fa682ae9869361de3 100644 GIT binary patch delta 16 XcmbQDIz@E@A0zWtzs;Kk8Jh(GFH8kQ delta 16 XcmbQDIz@E@A0zW}r@Na48Jh(GFN6hD diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser index 801f8b9e14f637e84a78da5dd139b9a5734f038d..5cfda85b32789d2cd2e404d1bd636914a7368750 100644 GIT binary patch delta 16 XcmdlgvsGpTA0zWtzulV!8C7@zF`NY% delta 16 XcmdlgvsGpTA0zW}r_Y-O8C7@zGAIQ% diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser index d67abdc56ade501ae1d6e4651b2e13c6ba78e7eb..1a33949c6f730b2664313815018e04736d2078d1 100644 GIT binary patch delta 16 XcmZovZB*UB$H=_Z@8M=a#sWbAE&v5N delta 16 XcmZovZB*UB$H=_gS!%N&V}T$5D47IV diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj index d50d6478..c0b7674b 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj @@ -7,7 +7,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -#sql iterator MediaIter(long id, String title, String description, long itemId, long itemTypeId, String houseId, long length, Timestamp created, Timestamp archived, Timestamp modified, Timestamp creation, byte[] poster); +#sql iterator MediaIter(long id, String title, String description, long itemId, long itemTypeId, String houseId, long length, Timestamp created, Timestamp archived, Timestamp modified, byte[] poster, Timestamp creation); @SuppressWarnings("unused") class MediaDAO extends EntityBaseDAO { @@ -63,8 +63,8 @@ class MediaDAO extends EntityBaseDAO { entity.setCreated(iterator.created()); entity.setArchived(iterator.archived()); entity.setModified(iterator.modified()); - entity.setCreation(iterator.creation()); entity.setPoster(iterator.poster()); + entity.setCreation(iterator.creation()); if (result == null) result = new ArrayList(); @@ -77,27 +77,27 @@ class MediaDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ID = :id }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ID = :id }; return iter; } @Override protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ITEMID = :id }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ITEMID = :id }; return iter; } public ResultSetIterImpl selectByTitle(DefaultContext context, String title) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE TITLE = :title }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE TITLE = :title }; return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA }; return iter; } diff --git a/server/user.mediacube.gui/pages/metadatadetails.zul b/server/user.mediacube.gui/pages/metadatadetails.zul index 31986426..e10186cd 100644 --- a/server/user.mediacube.gui/pages/metadatadetails.zul +++ b/server/user.mediacube.gui/pages/metadatadetails.zul @@ -39,7 +39,7 @@ - + diff --git a/server/user.mediacube.gui/pages/searchitems/details.zul b/server/user.mediacube.gui/pages/searchitems/details.zul index b77e7f8d..f550fe02 100644 --- a/server/user.mediacube.gui/pages/searchitems/details.zul +++ b/server/user.mediacube.gui/pages/searchitems/details.zul @@ -38,10 +38,6 @@