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

diff --git a/server/user.jobengine.osgi.server/pages/jobselector.zul b/server/user.jobengine.osgi.server/pages/jobselector.zul
index 65874ab36dae9e8445bb7d888037ca7ce13e0eaa..f18033d06ac620f817d1b6e1dc544fc496c136c6 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/jobselector.zul
+++ b/server/user.jobengine.osgi.server/pages/jobselector.zul
@@ -15,30 +15,25 @@
                                </template>\r
                        </listbox>\r
                </center>\r
-               <east size="25%" flex="true" splittable="true">\r
-<!--                   <grid sizedByContent="false" span="true" model="@bind(jlm.selectedJob)" vflex="true" style="border: none; background: #e3e3e3 !important;" -->\r
-<!--                           oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot."> -->\r
-                       <grid sizedByContent="false" span="true" model="@bind(jlm.selectedJob)">\r
+               <east size="25%" flex="true" splittable="true" collapsible="true">\r
+                       <grid sizedByContent="false" span="true" model="@bind(jlm.selectedJob)" vflex="true" style="border: none; background: #e3e3e3 !important;"\r
+                               oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">\r
                                <columns>\r
-                                       <column label="Sablon" hflex="1" align="left" />\r
+                                       <column label="" hflex="1" align="left" />\r
                                </columns>\r
                                <rows>\r
-                                       <row>\r
-                                               <label value="xxx" />\r
-                                       </row>\r
+                                       <template name="xmodel">\r
+                                               <row>\r
+                                                       <div sclass="details">\r
+                                                               <div>\r
+                                                                       <label value="Facilities:" />\r
+                                                                       <label value="@load(each.template)" />\r
+                                                               </div>\r
+                                                       </div>\r
+                                               </row>\r
+                                       </template>\r
                                </rows>\r
                        </grid>\r
-                       <!--                    <listbox model="@load(jlm.selectedJob)"> -->\r
-                       <!--                            <listhead> -->\r
-                       <!--                                    <listheader hflex="1" label="Sablon" align="left" /> -->\r
-                       <!--                            </listhead> -->\r
-\r
-                       <!--                            <template name="model"> -->\r
-                       <!--                                    <listitem> -->\r
-                       <!--                                            <listcell label="@load(each.name)" /> -->\r
-                       <!--                                    </listitem> -->\r
-                       <!--                            </template> -->\r
-                       <!--                    </listbox> -->\r
                </east>\r
        </borderlayout>\r
            \r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
index 3691f59df2e3d244440d99db805423d8cc1917ac..cc12be990d35d1b7c3a72ecd9c4ecb8ed162e89f 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
@@ -1,7 +1,5 @@
 package user.jobengine.zk.model;\r
 \r
-import java.util.Set;\r
-\r
 import org.zkoss.bind.annotation.AfterCompose;\r
 import org.zkoss.bind.annotation.Command;\r
 import org.zkoss.bind.annotation.ContextParam;\r
@@ -29,7 +27,7 @@ public class JobSelectorModel extends BaseModel {
        private IJobEngine jobEngine;\r
        private ListModelList<BasicDBObject> jobs;\r
        private BasicDBObject selectedJob;\r
-       private Set<BasicDBObject> selectedJobs;\r
+       private ListModelList<BasicDBObject> selectedJobs;\r
 \r
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
@@ -64,7 +62,7 @@ public class JobSelectorModel extends BaseModel {
                return selectedJob;\r
        }\r
 \r
-       public Set<BasicDBObject> getSelectedJobs() {\r
+       public ListModelList<BasicDBObject> getSelectedJobs() {\r
                return selectedJobs;\r
        }\r
 \r
@@ -82,7 +80,7 @@ public class JobSelectorModel extends BaseModel {
                this.selectedJob = selectedJob;\r
        }\r
 \r
-       public void setSelectedJobs(Set<BasicDBObject> selectedJobs) {\r
+       public void setSelectedJobs(ListModelList<BasicDBObject> selectedJobs) {\r
                this.selectedJobs = selectedJobs;\r
        }\r
 \r