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

Working on kanban

Browse Source
This commit is contained in:
Hillel Coren 2017-12-20 11:16:40 +02:00
parent eaafca64de
commit c0f7ff272c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Task.php
View File

@ -243,7 +243,7 @@ class Task extends EntityModel
$taskStatues = TaskStatus::scope()->orderBy('sort_order')->get(); $taskStatues = TaskStatus::scope()->orderBy('sort_order')->get();
foreach ($taskStatues as $status) { foreach ($taskStatues as $status) {
$statuses[$status->id] = $status->name; $statuses[$status->public_id] = $status->name;
} }
if (! $taskStatues->count()) { if (! $taskStatues->count()) {

2
app/Ninja/Repositories/TaskRepository.php
View File

@ -89,7 +89,7 @@ class TaskRepository extends BaseRepository
$query->orWhere('invoices.balance', '=', 0); $query->orWhere('invoices.balance', '=', 0);
} }
$query->orWhere(function ($query) use ($statuses) { $query->orWhere(function ($query) use ($statuses) {
$query->whereIn('tasks.task_status_id', $statuses) $query->whereIn('task_statuses.public_id', $statuses)
->whereNull('tasks.invoice_id'); ->whereNull('tasks.invoice_id');
}); });