Skip to content

Commit 9504a5b

Browse files
Federico Livatabacitu
authored andcommitted
Use passed request before fallback to global one (#34)
* CrudController::storeCrud and CrudController::updateCrud use request parameter or fallback to global instance
1 parent 630b6e9 commit 9504a5b

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/app/Http/Controllers/CrudController.php

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,24 @@ public function storeCrud(StoreRequest $request = null)
6969
{
7070
$this->crud->hasAccessOrFail('create');
7171

72+
// fallback to global request instance
73+
if (is_null($request)) {
74+
$request = \Request::instance();
75+
}
76+
7277
// insert item in the db
73-
$item = $this->crud->create(\Request::except(['redirect_after_save', 'password']));
78+
$item = $this->crud->create($request->except(['redirect_after_save', 'password']));
7479

7580
// show a success message
7681
\Alert::success(trans('backpack::crud.insert_success'))->flash();
7782

7883
// redirect the user where he chose to be redirected
79-
switch (\Request::input('redirect_after_save')) {
84+
switch ($request->input('redirect_after_save')) {
8085
case 'current_item_edit':
8186
return \Redirect::to($this->crud->route.'/'.$item->id.'/edit');
8287

8388
default:
84-
return \Redirect::to(\Request::input('redirect_after_save'));
89+
return \Redirect::to($request->input('redirect_after_save'));
8590
}
8691
}
8792

@@ -119,9 +124,13 @@ public function updateCrud(UpdateRequest $request = null)
119124
{
120125
$this->crud->hasAccessOrFail('update');
121126

122-
// update the row in the db
127+
// fallback to global request instance
128+
if (is_null($request)) {
129+
$request = \Request::instance();
130+
}
123131

124-
$this->crud->update(\Request::get('id'), \Request::except('redirect_after_save'));
132+
// update the row in the db
133+
$this->crud->update($request->get('id'), $request->except('redirect_after_save'));
125134

126135
// show a success message
127136
\Alert::success(trans('backpack::crud.update_success'))->flash();

0 commit comments

Comments
 (0)