Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5836 from turbo124/v5-develop

Browse Source 
Fixes for archived/deleted task reordering
This commit is contained in:
David Bomba 2021-05-27 09:59:34 +10:00 committed by GitHub
commit ad11e11233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/TaskController.php
View File

@ -631,6 +631,7 @@ class TaskController extends BaseController
$task_status = TaskStatus::where('id', $this->decodePrimaryKey($task_status_hashed_id)) $task_status = TaskStatus::where('id', $this->decodePrimaryKey($task_status_hashed_id))
->where('company_id', auth()->user()->company()->id) ->where('company_id', auth()->user()->company()->id)
->withTrashed()
->first(); ->first();
$task_status->status_order = $key; $task_status->status_order = $key;
@ -648,6 +649,7 @@ class TaskController extends BaseController
$task_record = Task::where('id', $this->decodePrimaryKey($task)) $task_record = Task::where('id', $this->decodePrimaryKey($task))
->where('company_id', auth()->user()->company()->id) ->where('company_id', auth()->user()->company()->id)
->withTrashed()
->first(); ->first();
$task_record->status_order = $key; $task_record->status_order = $key;

2
app/Libraries/MultiDB.php
View File

@ -270,7 +270,7 @@ class MultiDB
return false; return false;
} }
public static function findAndSetDbByDomain($query_array) :bool public static function findAndSetDbByDomain($query_array)
{ {
if (! config('ninja.db.multi_db_enabled')) if (! config('ninja.db.multi_db_enabled'))