Allow to cancel queued job - closes #606, #611

freescout-help-desk · May 16, 2020 · bc60281 · bc60281
1 parent 84b3df8
commit bc60281
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/Http/Controllers/SystemController.php b/app/Http/Controllers/SystemController.php
@@ -201,6 +201,11 @@ public function status(Request $request)
     public function action(Request $request)
     {
         switch ($request->action) {
+            case 'cancel_job':
+                \App\Job::where('id', $request->job_id)->delete();
+                \Session::flash('flash_success_floating', __('Done'));
+                break;
+
             case 'delete_failed_jobs':
                 \App\FailedJob::where('queue', $request->failed_queue)->delete();
                 \Session::flash('flash_success_floating', __('Failed jobs deleted'));

diff --git a/resources/views/system/status.blade.php b/resources/views/system/status.blade.php
@@ -172,7 +172,16 @@
                             <table class="table">
                                 <tbody>
                                     <tr>
-                                        <th colspan="2">{{ $loop->index+1 }}. {{ json_decode($job->payload, true)['displayName'] }}</th>
+                                        <th>{{ $loop->index+1 }}. {{ json_decode($job->payload, true)['displayName'] }}</th>
+                                        <th>
+                                            <form action="{{ route('system.action') }}" method="POST" class="text-right">
+                                                {{ csrf_field() }}
+
+                                                <input type="hidden" name="job_id" value="{{ $job->id }}" />
+
+                                                <button type="submit" name="action" value="cancel_job" class="btn btn-default btn-xs margin-left-10">{{ __('Cancel') }}</button>
+                                            </form>
+                                        </th>
                                     </tr>
                                     <tr>
                                         <td>{{ __('Queue') }}</td>