diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index e5504e3c..0028ced0 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -477,7 +477,13 @@ wrenchboard=# ]; } public function summaryReturnData($in,$out){ - $final_out = ( new \App\Models\ResultFormatter() )->processOutJson($in, $out); + if ($in["action"] == -1 ){ + $final_out = $in; + } + else{ + $final_out = ( new \App\Models\ResultFormatter() )->processOutJson($in, $out); + } + $final_out["environment"] = $this->current_env + 0; $final_out["session_image_server"] = $this->primary_image_sever; $final_out["server_tag"] = $this->server_tag; diff --git a/www-api/app/Controllers/WrenchJobs.php b/www-api/app/Controllers/WrenchJobs.php index 63a94cb4..68d51254 100644 --- a/www-api/app/Controllers/WrenchJobs.php +++ b/www-api/app/Controllers/WrenchJobs.php @@ -15,7 +15,7 @@ class WrenchJobs extends BaseController public function getJobsData() { $raw_json = file_get_contents('php://input'); $in = json_decode($raw_json, true); - //$in["action"] = WRENCHBOARD_ACCOUNT_JOBLIST; dont send this line , the formater will be confused + $in["action"] = -1; // bad number - we dont want formating WRENCHBOARD_ACCOUNT_JOBLIST; dont send this line , the formater will be confused $out=[]; $endpoint = "JOB_DATA-". $in["uid"];