Merge remote-tracking branch 'origin/master'

LaravelDaily · May 10, 2016 · f9a03e9 · f9a03e9
2 parents 69a3972 + b2f68a4
commit f9a03e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Controllers/QuickadminMenuController.php b/src/Controllers/QuickadminMenuController.php
@@ -300,7 +300,7 @@ public function edit($id)
     public function update(Request $request, $id)
     {
         $requestArray              = $request->all();
-        $requestArray['parent_id'] = $requestArray['parent_id'] ?: null;
+        $requestArray['parent_id'] = isset($requestArray['parent_id']) ? $requestArray['parent_id'] : null;
         $menu                      = Menu::findOrFail($id);
         $menu->update($requestArray);
         $menu->roles()->sync($request->input('roles', []));

diff --git a/src/routes.php b/src/routes.php
@@ -24,7 +24,7 @@
                             'uses' => 'Admin\\' . ucfirst(camel_case($menu->name)) . 'Controller@massDelete'
                         ]);
                         Route::resource(strtolower($menu->name),
-                            'Admin\\' . ucfirst(camel_case($menu->name)) . 'Controller');
+                            'Admin\\' . ucfirst(camel_case($menu->name)) . 'Controller', ['except' => 'show']);
                         break;
                     case 3:
                         Route::controller(strtolower($menu->name),