From: Omar Sweidan <omar.sweidan@userrendszerhaz.hu>
Date: Wed, 1 Jun 2022 10:04:30 +0000 (+0200)
Subject: assembleSchedulesJson-ban új objektum összeállítása
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=fb44df074121ea45182f6a8b6cbd32521202f294;p=mediacube.git

assembleSchedulesJson-ban új objektum összeállítása
---

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
index 29ab9bcd..eb1d5504 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
@@ -423,14 +423,22 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 		BasicDBObject dbo = new BasicDBObject();
 		BasicDBList jobList = new BasicDBList();
 		for (int i = 0; i < schedules.size(); i++) {
-			BasicDBObject temp = schedules.get(i).getValue();
-			temp.remove("xml");
-			temp.remove("nextTime");
-			if (temp.get("active") == null) {
-				temp.remove("active");
+			BasicDBObject temp= new BasicDBObject();
+			if (schedules.get(i).getValue().get("name") != null) {
+				temp.append("name", schedules.get(i).getValue().get("name"));
 			}
-			if (temp.get("executeimmediate") == null) {
-				temp.remove("executeimmediate");
+			temp.append("template", schedules.get(i).getValue().get("template"));
+			if (schedules.get(i).getValue().get("active") != null) {
+				temp.append("active", schedules.get(i).getValue().get("active"));
+			}
+			if (schedules.get(i).getValue().get("executeimmediate") != null) {
+				temp.append("executeimmediate", schedules.get(i).getValue().get("executeimmediate"));
+			}
+			if (schedules.get(i).getValue().get("cronexpression") != null) {
+				temp.append("cronexpression", schedules.get(i).getValue().get("cronexpression"));
+			}
+			if (schedules.get(i).getValue().get("parameters") != null) {
+				temp.append("parameters", new BasicDBList(schedules.get(i).getValue().get("parameters")));
 			}
 			jobList.add(temp);
 		}