cleanup

Author: ctf0

src/Controllers/Admin/MenusController.php

@@ -72,7 +72,7 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update($id, Request $request)
     {
         $this->validate($request, [
             'name' => 'required|unique:menus,name,'.$id,
@@ -87,8 +87,9 @@ public function update(Request $request, $id)
 
         $menu->update($request->except('saveList'));
 
-        // todo
-        // page nest list
+        /*
+         * todo "page nest list"
+         */
 
         return back();
     }
@@ -114,9 +115,9 @@ public function destroy($id)
      *
      * @return [type] [description]
      */
-    public function getMenuPages(Menu $id)
+    public function getMenuPages($id)
     {
-        $pages = $id->pages()->orderBy('pivot_order', 'asc')->get();
+        $pages = Menu::findOrFail($id)->pages()->orderBy('pivot_order', 'asc')->get();
 
         $pages->map(function ($item) {
             if (count($childs = $item->getDescendants()->toHierarchy())) {
@@ -145,7 +146,7 @@ public function getMenuPages(Menu $id)
      */
     public function removePage($id, Request $request)
     {
-        if (Menu::find($id)->pages()->detach($request->page_id)) {
+        if (Menu::findOrFail($id)->pages()->detach($request->page_id)) {
             Menu::find($id)->touch();
 
             return response()->json(['done'=>true]);

src/Controllers/Admin/PagesController.php

@@ -49,7 +49,7 @@ public function create()
      */
     public function store(Request $request)
     {
-        $this->storeValidation($request);
+        $this->sT_uP_Validaiton($request);
 
         $page        = Page::create($this->cleanEmptyTrans($request));
         $roles       = $request->input('roles') ?: [];
@@ -88,9 +88,9 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update($id, Request $request)
     {
-        $this->updateValidation($request, $id);
+        $this->sT_uP_Validaiton($request, $id);
 
         $page        = Page::findOrFail($id);
         $roles       = $request->input('roles') ?: [];
@@ -121,59 +121,22 @@ public function destroy($id)
         return redirect()->route('admin.pages.index');
     }
 
-    /**
-     * [storeValidation description].
-     *
-     * @param [type] $request [description]
-     *
-     * @return [type] [description]
-     */
-    protected function storeValidation($request)
+    protected function sT_uP_Validaiton($request, $id = null)
     {
-        $validator = Validator::make($request->all(), [
-            'template'    => 'required_without:action',
-            'route_name'  => 'required|unique:pages,route_name',
-            'roles'       => 'required',
-            'permissions' => 'required',
-        ]);
-
-        // because laravel is pretty fucked up when it comes to showing input array error
-        $validator->after(function ($validator) use ($request) {
-            if (!array_filter($request->url)) {
-                $validator->errors()->add('url', 'The Url is required');
-            }
-
-            if (!array_filter($request->title)) {
-                $validator->errors()->add('title', 'The Title is required');
-            }
-        });
+        $routename = 'required|unique:pages,route_name';
 
-        if ($validator->fails()) {
-            throw new ValidationException($validator, $this->buildFailedValidationResponse(
-                $request,
-                $this->formatValidationErrors($validator)
-            ));
+        if ($id) {
+            $routename = 'required|unique:pages,route_name,'.$id;
         }
-    }
 
-    /**
-     * [updateValidation description].
-     *
-     * @param [type] $request [description]
-     * @param [type] $id      [description]
-     *
-     * @return [type] [description]
-     */
-    protected function updateValidation($request, $id)
-    {
         $validator = Validator::make($request->all(), [
-            'template'     => 'required_without:action',
-            'route_name'   => 'required|unique:pages,route_name,'.$id,
-            'roles'        => 'required',
-            'permissions'  => 'required',
+            'template'    => 'required_without:action',
+            'route_name'  => $routename,
+            'roles'       => 'required',
+            'permissions' => 'required',
         ]);
 
-        // because laravel is pretty fucked up when it comes to showing input array error
+        // because laravel is pretty fucked up when it comes to showing array input error
         $validator->after(function ($validator) use ($request) {
             if (!array_filter($request->url)) {
                 $validator->errors()->add('url', 'Url is required');

src/Controllers/Admin/PermissionsController.php

@@ -70,7 +70,7 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update($id, Request $request)
     {
         $this->validate($request, [
             'name' => 'required',

src/Controllers/Admin/RolesController.php

@@ -77,7 +77,7 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update($id, Request $request)
     {
         $this->validate($request, [
             'name' => 'required',

src/Controllers/Admin/UsersController.php

@@ -86,11 +86,11 @@ public function edit($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update($id, Request $request)
     {
         $this->validate($request, [
-            'name'        => 'required',
-            'email'       => 'required|email|unique:users,email,'.$id,
+            'name'  => 'required',
+            'email' => 'required|email|unique:users,email,'.$id,
         ]);
 
         $user        = User::findOrFail($id);