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 task kanban

Browse Source
This commit is contained in:
Hillel Coren 2017-12-19 23:02:05 +02:00
parent a355ab0d67
commit cb4edaedc6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,14 @@ class TaskKanbanController extends BaseController
->with(['project', 'client', 'task_status']) ->with(['project', 'client', 'task_status'])
->whereNull('invoice_id') ->whereNull('invoice_id')
->orderBy('task_status_sort_order') ->orderBy('task_status_sort_order')
->orderBy('id')
->get();
$statuses = TaskStatus::scope()
->orderBy('sort_order')
->orderBy('id')
->get(); ->get();
$statuses = TaskStatus::scope()->orderBy('sort_order')->get();
$projects = Project::scope()->get(); $projects = Project::scope()->get();
$clients = Client::scope()->get(); $clients = Client::scope()->get();

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

@ -259,8 +259,7 @@
callback(response); callback(response);
}, },
error: function(error) { error: function(error) {
console.log('error'); swal("{{ trans('texts.error_refresh_page') }}");
console.log(error);
}, },
}).always(function() { }).always(function() {
setTimeout(function() { setTimeout(function() {
@ -270,7 +269,6 @@
} }
self.onStatusDragged = function(dragged) { self.onStatusDragged = function(dragged) {
console.log('onStatusDragged..');
var status = dragged.item; var status = dragged.item;
status.sort_order(dragged.targetIndex); status.sort_order(dragged.targetIndex);