From 59041ca7360a533857dd3caffabf4a3a71a3183d Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 20 Sep 2020 09:36:24 +0800 Subject: [PATCH] Move set task done button to progress column --- resources/views/jobs/partials/job-tasks.blade.php | 27 ++++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/resources/views/jobs/partials/job-tasks.blade.php b/resources/views/jobs/partials/job-tasks.blade.php index e27c3dd..108d511 100644 --- a/resources/views/jobs/partials/job-tasks.blade.php +++ b/resources/views/jobs/partials/job-tasks.blade.php @@ -31,19 +31,24 @@
{{ $task->name }}
{!! nl2br($task->description) !!}
- {{ $task->progress }} % + + {{ $task->progress }} % + + @can('update', $task) + @if ($task->progress < 100) + {!! FormField::formButton(['route' => ['tasks.set_done', $task], 'method' => 'patch'], + __('task.set_done'), + ['class' => 'btn btn-success btn-xs', 'id' => $task->id.'-set_task_done'], + [ + 'task_id' => $task->id, + 'job_id' => $task->job_id, + ] + ) !!} + @endif + @endcan + @can('update', $task) - @if ($task->progress < 100) - {!! FormField::formButton(['route' => ['tasks.set_done', $task], 'method' => 'patch'], - __('task.set_done'), - ['class' => 'btn btn-success btn-xs', 'id' => $task->id.'-set_task_done'], - [ - 'task_id' => $task->id, - 'job_id' => $task->job_id, - ] - ) !!} - @endif {!! html_link_to_route('jobs.show', '', [ $job, 'action' => 'task_edit',