diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 674f163eff78..73daf6959bf0 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -122,6 +122,7 @@ class SetupController extends Controller ]; try { + foreach ($env_values as $property => $value) { $this->updateEnvironmentProperty($property, $value); } diff --git a/app/Transformers/TaskStatusTransformer.php b/app/Transformers/TaskStatusTransformer.php index c52e6a19d9ac..05720fe5c0af 100644 --- a/app/Transformers/TaskStatusTransformer.php +++ b/app/Transformers/TaskStatusTransformer.php @@ -29,7 +29,7 @@ class TaskStatusTransformer extends EntityTransformer 'created_at' => (int) $task_status->created_at, 'updated_at' => (int) $task_status->updated_at, 'archived_at' => (int) $task_status->deleted_at, - 'status_order' => $task_status->status_order, + 'status_order' => is_null($task_status->status_order) ? null : (int)$task_status->status_order, ]; } } diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php index 8d669c33bd92..80cdaf6a5595 100644 --- a/app/Transformers/TaskTransformer.php +++ b/app/Transformers/TaskTransformer.php @@ -67,7 +67,7 @@ class TaskTransformer extends EntityTransformer 'status_id' => $this->encodePrimaryKey($task->status_id) ?: '', 'status_sort_order' => (int) $task->status_sort_order, //deprecated 5.0.34 'is_date_based' => (bool) $task->is_date_based, - 'status_order' => $task->status_order + 'status_order' => is_null($task->status_order) ? null : (int)$task->status_order, ]; } }