git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Tue, 20 Apr 2021 18:13:01 +0000 (18:13 +0000)
committervasary.daniel <TFS\vasary.daniel>
Tue, 20 Apr 2021 18:13:01 +0000 (18:13 +0000)
33 files changed:
server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser
server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj
server/user.mediacube.gui/pages/metadatadetails.zul
server/user.mediacube.gui/pages/searchitems/details.zul
server/user.mediacube.gui/src/user/jobengine/zk/model/MetadataDetailsModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java

index 1b8cd5efbc88b640aff35edfcbdbc3bf312a0690..47bc6d9e7cecee3c7b73ca3aa152b29a8d227365 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser differ
index 21e71cc4a7b5c9596417e348f1500946549a1482..c45cfa54e51a7c44cd84574daab0c8981d676605 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser differ
index f9206ac0d9a2163ade966fec12c41567632b12aa..bcbb788c046bc4f29b7125cb6851253254f046b8 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser differ
index de9d7df20bfd3a48a3f8712f5a6e6d6ba0116376..e8cf325deeb8d2c96c810fa49b7d9ae17078520b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser differ
index dad2100aab91f898d0904bee61062fb9a4814e6d..26cf3cfd04c5cbf38049d08e74c84de844fefdb1 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser differ
index 18b6577ace652ac2f0a0b5ef4b66bc6b98b3af5a..69cc1902ce53990647f980c6c009a3271710e885 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser differ
index 5f3d51e7bf5f72da78960ac8376e729bc287456e..1e9b8447faa4455c160997a50b97af12dc72c420 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser differ
index ab0eeacec76644a754e00b6080574dedffa2c01b..b621d807aee6ecdcbcefa293d71040702b8dd9b5 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser differ
index 6925b826962255ae93391f1e3d613fe6e5036c14..74f74a4b46cfb3b0c0bdddfa83c6bda10a6a376f 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser differ
index cb87d0df746d678f24002e3b2bbea0f029ad21cf..f1ac7ed5d4b69d58387efa5cbd5003db23cb3e11 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser differ
index 1d85834351e252548daaf9926e23df014422bb3a..7dec0bec46599519867060dd3d4a0f3197051feb 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser differ
index 4402c87929f91bed9cf5427c58e76c334a08544a..226a3ff8eb28c5eb1426d03bf7ee9713f6a3b821 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser differ
index dd8c65ed9cf866aa691c06a6923c5cc315b15ded..f331a910d93641b9311bd70a83b6b0fa4854818e 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser differ
index 3d424a0893621005c52ff2ff36d96889f512eb3d..60f415b34a356de88fdd32fabe9760b66c3c34bd 100644 (file)
@@ -17,8 +17,8 @@ class MediaIter
 extends sqlj.runtime.ref.ResultSetIterImpl
 implements sqlj.runtime.NamedIterator
 {
-  private int posterNdx;
   private int creationNdx;
+  private int posterNdx;
   private int modifiedNdx;
   private int archivedNdx;
   private int createdNdx;
@@ -43,8 +43,8 @@ implements sqlj.runtime.NamedIterator
     createdNdx = findColumn("created");
     archivedNdx = findColumn("archived");
     modifiedNdx = findColumn("modified");
-    creationNdx = findColumn("creation");
     posterNdx = findColumn("poster");
+    creationNdx = findColumn("creation");
   }
   public MediaIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
     throws java.sql.SQLException 
@@ -60,8 +60,8 @@ implements sqlj.runtime.NamedIterator
     createdNdx = findColumn("created");
     archivedNdx = findColumn("archived");
     modifiedNdx = findColumn("modified");
-    creationNdx = findColumn("creation");
     posterNdx = findColumn("poster");
+    creationNdx = findColumn("creation");
   }
   public long id() 
     throws java.sql.SQLException 
@@ -113,15 +113,15 @@ implements sqlj.runtime.NamedIterator
   {
     return resultSet.getTimestamp(modifiedNdx);
   }
-  public Timestamp creation() 
+  public byte[] poster() 
     throws java.sql.SQLException 
   {
-    return resultSet.getTimestamp(creationNdx);
+    return resultSet.getBytes(posterNdx);
   }
-  public byte[] poster() 
+  public Timestamp creation() 
     throws java.sql.SQLException 
   {
-    return resultSet.getBytes(posterNdx);
+    return resultSet.getTimestamp(creationNdx);
   }
 }
 
@@ -184,8 +184,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<IEntityBase>();                          
@@ -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;
        }
        
index af7204410c7542ba314eac99864fe3c6fd629f1c..1c50053578455c4b36e4853c27ccb4082be246c2 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser differ
index 174d5be5f9472bf42449c42008ca402286d64ae0..63809492d02630a31d8fd9b2bd6094ae994342d7 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser differ
index 1f4279941120f51285b0881aaeb4784c8e2fe51b..9274bb7582025c4af8f7f79e4dab45cc5ffa14d3 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser differ
index 08fdd9d6269a217e7f65ac74af1a29997d1fc366..1f5f78fe1d009da60c7b11dc12f816d6155093c0 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser differ
index f46ecd846ce66031bbba3cdb195cceed9a3e38ea..3a1ed9b2f6b6cf6e295cd53a4f2dcd17e4ea5724 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser differ
index aca192d35a0078e202d7149ac67b6a3c865d4264..ab0580c12708fded082a1fe7e5386ab82539f103 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser differ
index bcdbafc304416ca95274adba16827c96ed730585..490e48fd25d96011c21a42806aa14044c6de57b1 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser differ
index 4fe84ae7ae851ef8746c5dac5fb1048b0dfb3255..cad6efeae01b27bbd4fb0482cc6c45f52e9f618c 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser differ
index c05e6563d1a9e9b83fb24afccd48bab8f2c847cd..ae0b6b0961c7385f5708f12de8950edf406ba754 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser differ
index e01b8e100f539fea464d30402cd639f38736084c..c6dc75586fc40b65fce42888bb3d60c093ebf1fe 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser differ
index f193184c37ea6514daecf1dc3f75b132b326558b..755e7198d5dfbe1b865fc4c72623d192a5fbbce3 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser differ
index 7dca9ba07cbd60294721ecaa3259fd324eb58cdc..7b493860db149ab06ace7b4fa682ae9869361de3 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser differ
index 801f8b9e14f637e84a78da5dd139b9a5734f038d..5cfda85b32789d2cd2e404d1bd636914a7368750 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser differ
index d67abdc56ade501ae1d6e4651b2e13c6ba78e7eb..1a33949c6f730b2664313815018e04736d2078d1 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser differ
index d50d6478c6ea70ddbb28697aba7c94352eaa41f6..c0b7674b90adaaf290ef9166b5dfc203ee53171a 100644 (file)
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-#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);\r
+#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);\r
 \r
 @SuppressWarnings("unused")\r
 class MediaDAO extends EntityBaseDAO {\r
@@ -63,8 +63,8 @@ class MediaDAO extends EntityBaseDAO {
                        entity.setCreated(iterator.created());\r
                        entity.setArchived(iterator.archived());\r
                        entity.setModified(iterator.modified());\r
-                       entity.setCreation(iterator.creation());\r
                        entity.setPoster(iterator.poster());\r
+                       entity.setCreation(iterator.creation());\r
 \r
                        if (result == null)\r
                                result = new ArrayList<IEntityBase>();                          \r
@@ -77,27 +77,27 @@ class MediaDAO extends EntityBaseDAO {
        @Override\r
        protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ID = :id };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ID = :id };\r
                return iter;\r
        }\r
 \r
        @Override\r
        protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ITEMID = :id };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ITEMID = :id };\r
                return iter;\r
        }\r
        \r
        public ResultSetIterImpl selectByTitle(DefaultContext context, String title) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE TITLE = :title };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE TITLE = :title };\r
                return iter;\r
        }\r
        \r
        @Override\r
        protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA };\r
                return iter;\r
        }\r
        \r
index 31986426dae17ad3add727283805f0fdd805fd75..e10186cd9859b46131a3b145456726845042397f 100644 (file)
@@ -39,7 +39,7 @@
                                                <listitem id="media_creation">\r
                                                        <listcell label="Média dátuma" />\r
                                                        <listcell>\r
-                                                               <datebox hflex="true" value="@load(vm.archivedMedia.media.creation) @save(vm.archivedMedia.media.creation,before='save')" />\r
+                                                               <datebox value="@load(vm.archivedMedia.media.creation) @save(vm.archivedMedia.media.creation,before='save')" />\r
                                                        </listcell>\r
                                                </listitem>\r
                                                <listitem id="media_title">\r
index b77e7f8dc1e41018d966d3dae99add9110d0b113..f550fe021b33ab879cbd792b2fb09d971473890e 100644 (file)
                                        <label value="@load(vm.selectedObject.media.title)" />\r
                                </vlayout>\r
                        </hlayout>\r
-                       <vlayout>\r
-                               <label style="font-size:8pt; color: gray" value="Dátum" />\r
-                               <label value="@load(vm.selectedObject.media.creation)" />\r
-                       </vlayout>\r
                        <vlayout>\r
                                <label style="font-size:8pt; color: gray" value="Média leírása" />\r
                                <label multiline="true" value="@load(vm.selectedObject.media.description)" />\r
index 55e099e90a6093e37929fe08a2d9e807fadc32aa..e40aa3c7df9b2a366835751be2a34b08318acde9 100644 (file)
@@ -14,6 +14,7 @@ import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.Component;\r
 import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.WrongValueException;\r
+import org.zkoss.zk.ui.event.EventListener;\r
 import org.zkoss.zk.ui.select.Selectors;\r
 import org.zkoss.zk.ui.select.annotation.Listen;\r
 import org.zkoss.zk.ui.select.annotation.Wire;\r
@@ -41,11 +42,14 @@ public class MetadataDetailsModel extends BaseModel {
        @Wire\r
        private Button saveButton;\r
 \r
+       private EventListener<?> listener;\r
+\r
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
                Selectors.wireComponents(view, this, false);\r
                Selectors.wireEventListeners(view, this);\r
                archivedMedia = (ArchivedMedia) Executions.getCurrent().getArg().get("selectedObject");\r
+               listener = (EventListener<?>) Executions.getCurrent().getArg().get("listener");\r
                manager = ItemManager.getInstance();\r
                itemTypes = manager.getItemTypes();\r
                ListIterator<ItemType> iterator = itemTypes.listIterator();\r
@@ -76,6 +80,12 @@ public class MetadataDetailsModel extends BaseModel {
 \r
        @Command\r
        public void close() {\r
+               try {\r
+                       if (listener != null)\r
+                               listener.onEvent(null);\r
+               } catch (Exception e) {\r
+                       logger.error(e.getMessage());\r
+               }\r
                metadataEditorWnd.detach();\r
        }\r
 \r
index 8f3879819f765542354df55e0ca1aa7644d3c630..ad24ed70e9ee4a9fd780d60fe3bf7c771bfb60ec 100644 (file)
@@ -33,6 +33,7 @@ import org.zkoss.json.JSONObject;
 import org.zkoss.zk.ui.Component;\r
 import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.event.Event;\r
+import org.zkoss.zk.ui.event.EventListener;\r
 import org.zkoss.zk.ui.event.Events;\r
 import org.zkoss.zk.ui.event.KeyEvent;\r
 import org.zkoss.zk.ui.event.MouseEvent;\r
@@ -464,6 +465,8 @@ public class SearchModel extends AsyncBaseModel {
                        if (mediaFiles != null) {\r
                                for (MediaFile mf : mediaFiles) {\r
                                        Store store = mf.getStore();\r
+                                       if (store == null)\r
+                                               continue;\r
                                        //TODO a tartalek nem tud lowres lenni, de a TSM-nek nincs HTTP bejegyzese\r
                                        //                                      if (store.isLowres()) {\r
                                        //                                              StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);\r
@@ -725,13 +728,19 @@ public class SearchModel extends AsyncBaseModel {
        public void openMetaDataDialog() {\r
                if (metaWindow != null)\r
                        return;\r
+\r
+               //              EventListener<Event> eventListener = e -> {\r
+               //                      EventQueues.lookup("my super queue", EventQueues.APPLICATION, true).unsubscribe(this);\r
+               //              };\r
+               //              EventQueues.lookup("my super queue", EventQueues.APPLICATION, true).subscribe(eventListener);\r
                String template = "/pages/metadatadetails.zul";\r
-               metaWindow = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject));\r
-               metaWindow.doOverlapped();\r
-               metaWindow.addEventListener("onClose", e -> {\r
+               EventListener<?> listener = e -> {\r
                        logger.info("Meta window closed");\r
                        metaWindow = null;\r
-               });\r
+               };\r
+               metaWindow = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject, "listener", listener));\r
+               metaWindow.doOverlapped();\r
+               metaWindow.addEventListener("onClose", listener);\r
        }\r
 \r
        private void processFilterTagChanged(JSONObject jsObject) {\r