Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

Merge pull request #4747 from turbo124/v5-develop

Browse Source 
Fixes for task and task status order
This commit is contained in:
David Bomba 2021-01-22 22:18:51 +11:00 committed by GitHub
commit 1c3069d227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/SetupController.php
View File

@ -122,6 +122,7 @@ class SetupController extends Controller
]; ];
try { try {
foreach ($env_values as $property => $value) { foreach ($env_values as $property => $value) {
$this->updateEnvironmentProperty($property, $value); $this->updateEnvironmentProperty($property, $value);
} }

2
app/Transformers/TaskStatusTransformer.php
View File

@ -29,7 +29,7 @@ class TaskStatusTransformer extends EntityTransformer
'created_at' => (int) $task_status->created_at, 'created_at' => (int) $task_status->created_at,
'updated_at' => (int) $task_status->updated_at, 'updated_at' => (int) $task_status->updated_at,
'archived_at' => (int) $task_status->deleted_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,
]; ];
} }
} }

2
app/Transformers/TaskTransformer.php
View File

@ -67,7 +67,7 @@ class TaskTransformer extends EntityTransformer
'status_id' => $this->encodePrimaryKey($task->status_id) ?: '', 'status_id' => $this->encodePrimaryKey($task->status_id) ?: '',
'status_sort_order' => (int) $task->status_sort_order, //deprecated 5.0.34 'status_sort_order' => (int) $task->status_sort_order, //deprecated 5.0.34
'is_date_based' => (bool) $task->is_date_based, '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,
]; ];
} }
} }