From 2c40193914c8085c171ce2fd9e10ffe6a6afc0c3 Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Wed, 17 Jun 2020 13:59:20 +0000
Subject: [PATCH] validation in translation.en & unassigned case

---
 app/Console/Commands/ScheduleRunCommand.php | 2 +-
 workflow/engine/methods/scheduler/index.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/ScheduleRunCommand.php b/app/Console/Commands/ScheduleRunCommand.php
index 10937cb62..e642fc225 100755
--- a/app/Console/Commands/ScheduleRunCommand.php
+++ b/app/Console/Commands/ScheduleRunCommand.php
@@ -52,7 +52,7 @@ class ScheduleRunCommand extends BaseCommand
                 $ending = isset($p->startingTime) ? $p->endingTime : "23:59";
 
                 $timezone = isset($p->timezone) && $p->timezone != "" ? $p->timezone : date_default_timezone_get();
-                $body = str_replace("-c", $user . " -c", $p->body);
+                $body = str_replace(" -c"," " . $user . " -c", $p->body);
                 $that->schedule->exec($body)->cron($p->expression)->between($starting, $ending)->timezone($timezone)->when(function () use ($p) {
                     $now = Carbon::now();
                     $result = false;
diff --git a/workflow/engine/methods/scheduler/index.php b/workflow/engine/methods/scheduler/index.php
index 36f69107d..3185d2ddc 100755
--- a/workflow/engine/methods/scheduler/index.php
+++ b/workflow/engine/methods/scheduler/index.php
@@ -17,8 +17,11 @@ try {
     $fields["category"] = $category;
     $fields["lang"] = SYS_LANG;
     $fields["workspace"] = config("system.workspace");
-    $fields["translation"] = "/js/ext/translation." . SYS_LANG . "." . G::browserCacheFilesGetUid() . ".js";  
-
+    if (G::browserCacheFilesGetUid()) {
+        $fields["translation"] = "/js/ext/translation." . SYS_LANG . "." . G::browserCacheFilesGetUid() . ".js";  
+    } else {
+        $fields["translation"] = "/js/ext/translation." . SYS_LANG . ".js";  
+    }
     $G_PUBLISH->addContent('smarty' , 'scheduler/index.html' , '', '' , $fields); //Adding a HTML file .html
     $G_PUBLISH->addContent('smarty' , PATH_HOME . 'public_html/lib/taskscheduler/index.html'); //Adding a HTML file .html
     G::RenderPage("publish" , "raw");