diff --git a/app/Ninja/Repositories/TaskRepository.php b/app/Ninja/Repositories/TaskRepository.php index 56da52cc62eb..59b3a4b5ab98 100644 --- a/app/Ninja/Repositories/TaskRepository.php +++ b/app/Ninja/Repositories/TaskRepository.php @@ -5,6 +5,7 @@ namespace App\Ninja\Repositories; use App\Models\Client; use App\Models\Project; use App\Models\Task; +use App\Models\TaskStatus; use Auth; use Session; use DB; @@ -161,6 +162,12 @@ class TaskRepository extends BaseRepository if (isset($data['description'])) { $task->description = trim($data['description']); } + if (isset($data['task_status_id'])) { + $task->task_status_id = $data['task_status_id'] ? TaskStatus::getPrivateId($data['task_status_id']) : null; + } + if (isset($data['task_status_sort_order'])) { + $task->task_status_sort_order = $data['task_status_sort_order']; + } if (isset($data['time_log'])) { $timeLog = json_decode($data['time_log']); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 6c6f91d55909..c5fdb4e173b9 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2490,7 +2490,7 @@ $LANG = array( 'clear' => 'Clear', 'warn_payment_gateway' => 'Note: accepting online payments requires a payment gateway, :link to add one.', 'task_rate' => 'Task Rate', - 'task_rate_help' => 'Set the default rate for invoiced tasks.', + 'task_rate_help' => 'Set the default rate for invoiced tasks.', 'past_due' => 'Past Due', 'document' => 'Document', 'invoice_or_expense' => 'Invoice/Expense', diff --git a/resources/views/tasks/kanban.blade.php b/resources/views/tasks/kanban.blade.php index 08d75ad74b02..ba48759f3ac8 100644 --- a/resources/views/tasks/kanban.blade.php +++ b/resources/views/tasks/kanban.blade.php @@ -50,7 +50,7 @@ } .kanban-column-row { - margin-bottom: -8px; + margin-bottom: -12px; } .kanban-column-row .fa-circle { @@ -59,6 +59,10 @@ padding-right: 8px; } + .kanban-column-row .panel { + word-break: break-all; + } + .kanban-column-row .view div { padding: 8px; } @@ -144,6 +148,7 @@ self.is_adding_status = ko.observable(false); self.new_status = ko.observable(''); self.filter = ko.observable(''); + self.is_sending_request = ko.observable(false); for (var i=0; i