Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Kanban fixes

Browse Source
This commit is contained in:
Hillel Coren 2018-02-01 21:25:18 +02:00
parent 070d2ac853
commit a7e82eb16e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/TaskKanbanController.php
View File

@ -58,7 +58,6 @@ class TaskKanbanController extends BaseController
// otherwise, check that the tasks orders are correct
} else {
$firstStatus = $statuses[0];
$adjustment = 0;
$counts = [];
foreach ($tasks as $task) {
if (! $task->task_status || $task->task_status->trashed()) {
@ -118,7 +117,7 @@ class TaskKanbanController extends BaseController
$origSortOrder = $status->sort_order;
$newSortOrder = request('sort_order');
if ($newSortOrder != $origSortOrder) {
if (request()->has('sort_order') && $newSortOrder != $origSortOrder) {
TaskStatus::scope()
->where('sort_order', '>', $origSortOrder)
->decrement('sort_order');

2
resources/views/tasks/kanban.blade.php
View File

@ -793,9 +793,11 @@
<button type='button' class='btn btn-default btn-sm' data-bind="click: cancelNewStatus">
{{ trans('texts.cancel') }}
</button>
<!--
<button type='button' class='btn btn-success btn-sm' data-bind="click: saveNewStatus">
{{ trans('texts.save') }}
</button>
-->
</div>
</div>
</div>