Changeloge update

Date in readable format for next schedule entry Robot edit button disable when no robot defined on execution page.
cerberustesting · Jun 8, 2024 · 387fd02 · 387fd02
1 parent cd54042
commit 387fd02
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/...ce/src/main/java/org/cerberus/core/servlet/information/ReadCerberusDetailInformation.java b/...ce/src/main/java/org/cerberus/core/servlet/information/ReadCerberusDetailInformation.java
@@ -70,7 +70,7 @@ public class ReadCerberusDetailInformation extends HttpServlet {
 
     private static final Logger LOG = LogManager.getLogger(ReadCerberusDetailInformation.class);
 
-    private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.S'Z'";
+    private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.S";
 
     private ICerberusInformationDAO cerberusDatabaseInformation;
     private IDatabaseVersioningService databaseVersionService;
@@ -132,7 +132,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
                     objectTrig.put("triggerName", triggerSet.getJobDataMap().getString("name"));
                     objectTrig.put("triggerType", triggerSet.getJobDataMap().getString("type"));
                     objectTrig.put("triggerUserCreated", triggerSet.getJobDataMap().getString("user"));
-                    objectTrig.put("triggerNextFiretime", triggerSet.getFireTimeAfter(new Date()));
+                    objectTrig.put("triggerNextFiretime", new SimpleDateFormat(DATE_FORMAT).format(triggerSet.getFireTimeAfter(new Date())));
                     objectTrig.put("triggerCronDefinition", triggerSet.getJobDataMap().getString("cronDefinition"));
                     triggerList.add(objectTrig);
                 }

diff --git a/source/src/main/resources/documentation/D2/include/en/changelog_4.19_en.adoc b/source/src/main/resources/documentation/D2/include/en/changelog_4.19_en.adoc
@@ -1,6 +1,7 @@
 *Bug fixes*
 [square]
-* 
+* [ENGINE] Fixed NPE when making a control on non successful service answer.
+* [GUI] Fixed an issue when adding an environment to an existing application
 
 *Improvements / New features*
 [square]
@@ -9,8 +10,11 @@
 * [GUI] Improved navigation on campaign execution screen. Adding CTA on top of the screen and toggle buttons for reporting details hidden by default.
 * [GUI] Both campaign and execution reporting over time now include an availability KPI based on nb and time of OK.
 * [GUI] direct access to Both campaign and execution reporting over time from campaign execution and test case execution screen.
+* [ENGINE] Submit execution from campaign, only if application environment exist avoiding Errors in queue.
+* [GUI] Testcase environment selection combo has been replaced by checkbox
+* [ENGINE] New reserved keyword %datalib.DATALIBNAME.value% and %datalib.DATALIBNAME.base64%
 
 
 *Warning to be considered before applying the version (deprecated features)*
 [square]
-* 
+* [ENGINE] Datalib no longuer support direct definition of SOAP Calls. You need to replace them by SOAP services.
diff --git a/source/src/main/webapp/js/pages/CerberusInformation.js b/source/src/main/webapp/js/pages/CerberusInformation.js
@@ -237,7 +237,7 @@ function feedContent() {
             row.append(cel1);
             var cel1 = $("<td rowspan='2'></td>").append(obj.triggerName);
             row.append(cel1);
-            var cel1 = $("<td></td>").append(obj.triggerNextFiretime);
+            var cel1 = $("<td></td>").append(new Date(obj.triggerNextFiretime).toLocaleString());
             row.append(cel1);
             var cel1 = $("<td></td>").append(obj.triggerUserCreated);
             row.append(cel1);

diff --git a/source/src/main/webapp/js/pages/TestCaseExecution.js b/source/src/main/webapp/js/pages/TestCaseExecution.js
@@ -1449,6 +1449,12 @@ function setConfigPanel(data) {
     configPanel.find("input#controlstatus2").val(data.controlStatus);
     configPanel.find("textarea#controlmessage").val(data.controlMessage);
     configPanel.find("input#robot").val(data.robot);
+    if (isEmpty(data.robot)) {
+        configPanel.find("#editRobot").attr("disabled", true);
+    } else {
+        configPanel.find("#editRobot").attr("disabled", false);
+    }
+
     configPanel.find("input#robotexe").val(data.robotExecutor);
     configPanel.find("input#robothost").val(data.robotHost);
     configPanel.find("input#robotport").val(data.robotPort);