@@ -102,8 +102,4 @@ |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |
@@ -102,8 +102,4 @@ |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | public function index() |
| 18 | 18 | { |
| 19 | - $data['roles'] = Roles::all(); |
|
| 20 | - return view('roles.index', $data); |
|
| 19 | + $data['roles'] = Roles::all(); |
|
| 20 | + return view('roles.index', $data); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | <<<<<<< HEAD |
@@ -102,8 +102,4 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |
@@ -102,8 +102,4 @@ |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |
@@ -16,11 +16,11 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | public function index() |
| 18 | 18 | { |
| 19 | - $data['roles'] = Roles::all(); |
|
| 19 | + $data[ 'roles' ] = Roles::all(); |
|
| 20 | 20 | return view('roles.index', $data); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | -<<<<<<< HEAD |
|
| 23 | +<< << <<< HEAD |
|
| 24 | 24 | /** |
| 25 | 25 | * Search for a specific role. |
| 26 | 26 | * |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | public function search(Request $request) |
| 31 | 31 | { |
| 32 | 32 | $term = $request->get('term'); |
| 33 | - $data['roles'] = Roles::where('name', 'LIKE', "$term")->get(); |
|
| 33 | + $data[ 'roles'] = Roles::where('name', 'LIKE', "$term")->get(); |
|
| 34 | 34 | return view('roles.index', $data); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function show($id) |
| 44 | 44 | { |
| 45 | - $data['query'] = Roles::find($id); |
|
| 45 | + $data[ 'query'] = Roles::find($id); |
|
| 46 | 46 | return view('roles.specific', $data); |
| 47 | 47 | } |
| 48 | 48 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | public function edit($id) |
| 82 | 82 | { |
| 83 | - $data['query'] = Roles::find($id); |
|
| 83 | + $data[ 'query'] = Roles::find($id); |
|
| 84 | 84 | return view('roles.edit', $data); |
| 85 | 85 | } |
| 86 | 86 | |
@@ -102,8 +102,4 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |
@@ -102,8 +102,4 @@ |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |
@@ -102,8 +102,4 @@ |
||
| 102 | 102 | */ |
| 103 | 103 | public function destroy($id) |
| 104 | 104 | { |
| 105 | - Roles::destroy($id); |
|
| 106 | - session()->flash('message', 'Role deleted'); |
|
| 107 | - return redirect()->back(302); |
|
| 108 | - } |
|
| 109 | -} |
|
| 105 | + Roles::destroy($id |
|
| 110 | 106 | \ No newline at end of file |