Merge remote-tracking branch 'origin/master'

Author: ModestasV

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', []));

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),