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

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java
index d9a9e0ed0503e51288ce1ce1e0bc1e1584756a9a..187dc0fe79a4feda03017e21f8ec65c2d5092ed9 100644 (file)
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java
@@ -151,9 +151,18 @@ public class JobEditorModel2 extends BaseModel {
 //             NoSQLUtils.deepCopy(editingJob, selectedJob);           \r
                for (int i = 0; i < jobEngine.getJobEngineConfiguration().getSchedules().size(); i++) {\r
                        if (jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().get("name")\r
-                                       .equals(selectedJob.get("name"))) {\r
+                                       .equals(originalJobName)) {\r
+                               jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("name",\r
+                                               selectedJob.get("name"));\r
+                               jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("cronexpression",\r
+                                               selectedJob.get("cronexpression"));\r
+                               jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("active",\r
+                                               selectedJob.get("active"));\r
+                               jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("executeimmediate",\r
+                                               selectedJob.get("executeimmediate"));\r
                                ((BasicDBList) jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().get("parameters"))\r
                                                .putAll((BasicDBList) selectedJob.get("parameters"));\r
+                               originalJobName = selectedJob.getString("name");\r
                        }\r
                }\r
        }\r
@@ -181,9 +190,9 @@ public class JobEditorModel2 extends BaseModel {
 \r
        public void setSelectedJob(BasicDBObject selectedJob) {\r
                this.selectedJob = selectedJob;\r
-               NoSQLUtils.deepCopy(selectedJob, originalJob);\r
-               if (selectedJob == null) {\r
-               } else {\r
+               if (selectedJob != null) {\r
+                       setOriginalJobName(selectedJob.getString("name"));\r
+                       NoSQLUtils.deepCopy(selectedJob, originalJob);\r
                        String cronExpression = selectedJob.getString(CRONEXPRESSION);\r
                        if (StringUtils.isBlank(cronExpression))\r
                                return;\r
@@ -195,10 +204,6 @@ public class JobEditorModel2 extends BaseModel {
                        } catch (ParseException e) {\r
                                logger.catching(e);\r
                        }\r
-\r
-                       // TODO update editingJob, create deep copy from editedJob: a megoldas a\r
-                       // NoSQLUtils-ba keruljon\r
-                       // TODO notify editingJob changed\r
                }\r
        }\r
 \r
@@ -240,8 +245,9 @@ public class JobEditorModel2 extends BaseModel {
        }\r
 \r
        private void initJobList() {\r
-//             setSelectedJob(null);\r
-               setEditingJob(null);\r
+               setSelectedJob(null);\r
+               setOriginalJobName(null);\r
+//             setEditingJob(null);\r
                jobs.clear();\r
                List<BasicDBObject> jobsCollection = new ArrayList<BasicDBObject>();\r
 \r
@@ -259,7 +265,6 @@ public class JobEditorModel2 extends BaseModel {
                        return aName.toLowerCase().compareTo(bName.toLowerCase());\r
                });\r
                jobs.addAll(jobsCollection);\r
-\r
        }\r
 \r
        @Command\r
@@ -343,9 +348,9 @@ public class JobEditorModel2 extends BaseModel {
 \r
        @Command\r
        public void duplicateTemplate() {\r
-               if (editingJob != null) {\r
-                       jobEngine.getJobEngineConfiguration().duplicateTemplate(selectedJob.getString("template"));\r
-               }\r
+//             if (editingJob != null) {\r
+               jobEngine.getJobEngineConfiguration().duplicateTemplate(selectedJob.getString("template"));\r
+//             }\r
        }\r
 \r
        @Command\r
@@ -454,9 +459,9 @@ public class JobEditorModel2 extends BaseModel {
 //             this.selectedJob = selectedJob;\r
 //     }\r
 \r
-       public void setEditingJob(BasicDBObject deepCopy) {\r
-\r
-       }\r
+//     public void setEditingJob(BasicDBObject editingJob) {\r
+//\r
+//     }\r
 \r
        public ArrayList<String> getDataTypes() {\r
                return dataTypes;\r