Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-14 06:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add 'resume task' to task list actions

Browse Source
This commit is contained in:
Hillel Coren 2017-05-22 21:35:50 +03:00
parent cf02cdc163
commit a2e9d343f2
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/TaskController.php
View File

@ -253,11 +253,9 @@ class TaskController extends BaseController
$action = Input::get('action'); $action = Input::get('action');
$ids = Input::get('public_id') ?: (Input::get('id') ?: Input::get('ids')); $ids = Input::get('public_id') ?: (Input::get('id') ?: Input::get('ids'));
if ($action == 'stop') { if (in_array($action, ['resume', 'stop'])) {
$this->taskRepo->save($ids, ['action' => $action]); $this->taskRepo->save($ids, ['action' => $action]);
Session::flash('message', trans('texts.stopped_task')); return Redirect::to('tasks')->withMessage(trans($action == 'stop' ? 'texts.stopped_task' : 'texts.resumed_task'));
return Redirect::to('tasks');
} elseif ($action == 'invoice' || $action == 'add_to_invoice') { } elseif ($action == 'invoice' || $action == 'add_to_invoice') {
$tasks = Task::scope($ids)->with('client')->orderBy('project_id', 'id')->get(); $tasks = Task::scope($ids)->with('client')->orderBy('project_id', 'id')->get();
$clientPublicId = false; $clientPublicId = false;

11
app/Ninja/Datatables/TaskDatatable.php
View File

@ -88,6 +88,15 @@ class TaskDatatable extends EntityDatatable
return $model->invoice_number && Auth::user()->can('editByOwner', [ENTITY_INVOICE, $model->invoice_user_id]); return $model->invoice_number && Auth::user()->can('editByOwner', [ENTITY_INVOICE, $model->invoice_user_id]);
}, },
], ],
[
trans('texts.resume_task'),
function ($model) {
return "javascript:submitForm_task('resume', {$model->public_id})";
},
function ($model) {
return ! $model->is_running && Auth::user()->can('editByOwner', [ENTITY_TASK, $model->user_id]);
},
],
[ [
trans('texts.stop_task'), trans('texts.stop_task'),
function ($model) { function ($model) {
@ -103,7 +112,7 @@ class TaskDatatable extends EntityDatatable
return "javascript:submitForm_task('invoice', {$model->public_id})"; return "javascript:submitForm_task('invoice', {$model->public_id})";
}, },
function ($model) { function ($model) {
return ! $model->invoice_number && (! $model->deleted_at || $model->deleted_at == '0000-00-00') && Auth::user()->can('create', ENTITY_INVOICE); return ! $model->is_running && ! $model->invoice_number && (! $model->deleted_at || $model->deleted_at == '0000-00-00') && Auth::user()->can('create', ENTITY_INVOICE);
}, },
], ],
]; ];

2
resources/lang/en/texts.php
View File

@ -2252,6 +2252,8 @@ $LANG = array(
'invoiceplane_import' => 'Use :link to migrate your data from InvoicePlane.', 'invoiceplane_import' => 'Use :link to migrate your data from InvoicePlane.',
'duplicate_expense_warning' => 'Warning: This :link may be a duplicate', 'duplicate_expense_warning' => 'Warning: This :link may be a duplicate',
'expense_link' => 'expense', 'expense_link' => 'expense',
'resume_task' => 'Resume Task',
'resumed_task' => 'Successfully resumed task',
); );