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

When Archiving/Deleting Recurring Invoices, Silently Drops into Invoice Screen #1377

Browse Source
This commit is contained in:
Hillel Coren 2017-03-13 21:27:32 +02:00
parent 35b139fa91
commit ce3afdaf8d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BaseController.php
View File

@ -37,7 +37,7 @@ class BaseController extends Controller
// when restoring redirect to entity // when restoring redirect to entity
if ($action == 'restore' && count($ids) == 1) { if ($action == 'restore' && count($ids) == 1) {
return redirect("{$entityTypes}/" . $ids[0]); return redirect("{$entityTypes}/" . $ids[0] . '/edit');
// when viewing from a datatable list // when viewing from a datatable list
} elseif (strpos($referer, '/clients/')) { } elseif (strpos($referer, '/clients/')) {
return redirect($referer); return redirect($referer);
@ -45,7 +45,7 @@ class BaseController extends Controller
return redirect("{$entityTypes}"); return redirect("{$entityTypes}");
// when viewing individual entity // when viewing individual entity
} elseif (count($ids)) { } elseif (count($ids)) {
return redirect("{$entityTypes}/" . $ids[0]); return redirect("{$entityTypes}/" . $ids[0] . '/edit');
} else { } else {
return redirect("{$entityTypes}"); return redirect("{$entityTypes}");
} }

5
app/Http/Controllers/InvoiceController.php
View File

@ -464,7 +464,6 @@ class InvoiceController extends BaseController
public function bulk($entityType = ENTITY_INVOICE) public function bulk($entityType = ENTITY_INVOICE)
{ {
$action = Input::get('bulk_action') ?: Input::get('action'); $action = Input::get('bulk_action') ?: Input::get('action');
;
$ids = Input::get('bulk_public_id') ?: (Input::get('public_id') ?: Input::get('ids')); $ids = Input::get('bulk_public_id') ?: (Input::get('public_id') ?: Input::get('ids'));
$count = $this->invoiceService->bulk($ids, $action); $count = $this->invoiceService->bulk($ids, $action);
@ -482,6 +481,10 @@ class InvoiceController extends BaseController
Session::flash('message', $message); Session::flash('message', $message);
} }
if (strpos(\Request::server('HTTP_REFERER'), 'recurring_invoices')) {
$entityType = ENTITY_RECURRING_INVOICE;
}
return $this->returnBulk($entityType, $action, $ids); return $this->returnBulk($entityType, $action, $ids);
} }