From bce5b3b24b08f3855d6b886f247d049ef80be3fc Mon Sep 17 00:00:00 2001
From: Sweidan Omar <TFS\sweidan.omar>
Date: Thu, 5 May 2022 07:56:39 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33294

---
 .../jobengine/zk/model/JobEditorModel2.java   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

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