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

Kanban fixes

Browse Source
This commit is contained in:
Hillel Coren 2018-02-01 21:26:42 +02:00
parent 479a710cb6
commit 62ddfdedd3
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 // otherwise, check that the tasks orders are correct
} else { } else {
$firstStatus = $statuses[0]; $firstStatus = $statuses[0];
$adjustment = 0;
$counts = []; $counts = [];
foreach ($tasks as $task) { foreach ($tasks as $task) {
if (! $task->task_status || $task->task_status->trashed()) { if (! $task->task_status || $task->task_status->trashed()) {
@ -118,7 +117,7 @@ class TaskKanbanController extends BaseController
$origSortOrder = $status->sort_order; $origSortOrder = $status->sort_order;
$newSortOrder = request('sort_order'); $newSortOrder = request('sort_order');
if ($newSortOrder != $origSortOrder) { if (request()->has('sort_order') && $newSortOrder != $origSortOrder) {
TaskStatus::scope() TaskStatus::scope()
->where('sort_order', '>', $origSortOrder) ->where('sort_order', '>', $origSortOrder)
->decrement('sort_order'); ->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"> <button type='button' class='btn btn-default btn-sm' data-bind="click: cancelNewStatus">
{{ trans('texts.cancel') }} {{ trans('texts.cancel') }}
</button> </button>
<!--
<button type='button' class='btn btn-success btn-sm' data-bind="click: saveNewStatus"> <button type='button' class='btn btn-success btn-sm' data-bind="click: saveNewStatus">
{{ trans('texts.save') }} {{ trans('texts.save') }}
</button> </button>
-->
</div> </div>
</div> </div>
</div> </div>