cleanup

Author: ctf0

src/Controllers/Admin/MenusController.php

@@ -40,7 +40,7 @@ public function create()
     public function store(Request $request)
     {
         $this->validate($request, [
-            'name' => 'required',
+            'name' => 'required|unique:menus,name',
         ]);
 
         Menu::create($request->all());
@@ -73,7 +73,7 @@ public function edit($id)
     public function update(Request $request, $id)
     {
         $this->validate($request, [
-            'name' => 'required',
+            'name' => 'required|unique:menus,name,'.$id,
         ]);
 
         Menu::findOrFail($id)->update($request->all());

src/resources/views/pages/bulma/menus/create.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', null, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">

src/resources/views/pages/bulma/menus/edit.blade.php

@@ -5,22 +5,22 @@
     <h3 class="title">
         <a href="{{ route('admin.menus.index') }}">Go Back</a>
     </h3>
-    
+
     {{ Form::model($menu, ['method' => 'PUT', 'route' => ['admin.menus.update', $menu->id]]) }}
-        
+
         {{-- name --}}
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', $menu->name, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">
                     {{ $errors->first('name') }}
                 </p>
             @endif
         </div>
-        
+
         {{ Form::submit(trans('SimpleMenu::messages.app_update'), ['class' => 'button is-warning']) }}
     {{ Form::close() }}
-@stop
+@stop

src/resources/views/pages/bulma/permissions/create.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', null, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">

src/resources/views/pages/bulma/permissions/edit.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', $permission->name, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">

src/resources/views/pages/bulma/roles/create.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', null, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <span class="help is-danger">
@@ -25,7 +25,7 @@
         <div class="field">
             {{ Form::label('permissions', 'Permissions', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::select('permissions[]', $permissions, old('permissions'), ['class' => 'select2', 'multiple' => 'multiple']) }}
+                {{ Form::select('permissions[]', $permissions, null, ['class' => 'select2', 'multiple' => 'multiple']) }}
             </div>
             @if($errors->has('permissions'))
                 <span class="help is-danger">

src/resources/views/pages/bulma/roles/edit.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', $role->name, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">
@@ -25,7 +25,7 @@
         <div class="field">
             {{ Form::label('permissions', 'Permissions', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::select('permissions[]', $permissions, old('permissions') ?: $role->permissions()->pluck('name', 'name'), ['class' => 'select2', 'multiple' => 'multiple']) }}
+                {{ Form::select('permissions[]', $permissions, $role->permissions()->pluck('name', 'name'), ['class' => 'select2', 'multiple' => 'multiple']) }}
             </div>
             @if($errors->has('permissions'))
                 <p class="help is-danger">

src/resources/views/pages/bulma/users/create.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', null, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">
@@ -25,7 +25,7 @@
         <div class="field">
             {{ Form::label('email', 'Email', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::email('email', old('email'), ['class' => 'input']) }}
+                {{ Form::email('email', null, ['class' => 'input']) }}
             </div>
             @if($errors->has('email'))
                 <p class="help is-danger">
@@ -51,7 +51,7 @@
         <div class="field">
             {{ Form::label('roles', 'Roles', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::select('roles[]', $roles, old('roles'), ['class' => 'select2', 'multiple' => 'multiple']) }}
+                {{ Form::select('roles[]', $roles, null, ['class' => 'select2', 'multiple' => 'multiple']) }}
             </div>
             @if($errors->has('roles'))
                 <p class="help is-danger">
@@ -64,7 +64,7 @@
         <div class="field">
             {{ Form::label('permissions', 'Permissions', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::select('permissions[]', $permissions, old('permissions'), ['class' => 'select2', 'multiple' => 'multiple']) }}
+                {{ Form::select('permissions[]', $permissions, null, ['class' => 'select2', 'multiple' => 'multiple']) }}
             </div>
             @if($errors->has('permissions'))
                 <p class="help is-danger">

src/resources/views/pages/bulma/users/edit.blade.php

@@ -12,7 +12,7 @@
         <div class="field">
             {{ Form::label('name', 'Name', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::text('name', old('name'), ['class' => 'input']) }}
+                {{ Form::text('name', $user->name, ['class' => 'input']) }}
             </div>
             @if($errors->has('name'))
                 <p class="help is-danger">
@@ -25,7 +25,7 @@
         <div class="field">
             {{ Form::label('email', 'Email', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::email('email', old('email'), ['class' => 'input']) }}
+                {{ Form::email('email', $user->email, ['class' => 'input']) }}
             </div>
             @if($errors->has('email'))
                 <p class="help is-danger">
@@ -50,7 +50,7 @@
         <div class="field">
             {{ Form::label('roles', 'Roles', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::select('roles[]', $roles, old('roles') ?: $user->roles()->pluck('name', 'name'), ['class' => 'select2', 'multiple' => 'multiple']) }}
+                {{ Form::select('roles[]', $roles, $user->roles()->pluck('name', 'name'), ['class' => 'select2', 'multiple' => 'multiple']) }}
             </div>
             @if($errors->has('roles'))
                 <p class="help is-danger">
@@ -63,7 +63,7 @@
         <div class="field">
             {{ Form::label('permissions', 'Permissions', ['class' => 'label']) }}
             <div class="control">
-                {{ Form::select('permissions[]', $permissions, old('permissions') ?: $user->permissions()->pluck('name', 'name'), ['class' => 'select2', 'multiple' => 'multiple']) }}
+                {{ Form::select('permissions[]', $permissions, $user->permissions()->pluck('name', 'name'), ['class' => 'select2', 'multiple' => 'multiple']) }}
             </div>
             @if($errors->has('permissions'))
                 <p class="help is-danger">