Merge pull request #1615 from z-song/1.5

1.5

Author: z-song

resources/assets/laravel-admin/laravel-admin.js

@@ -5,6 +5,16 @@ $.fn.editable.defaults.params = function (params) {
     return params;
 };
 
+$.fn.editable.defaults.error = function (data) {
+    var msg = '';
+    if (data.responseJSON.errors) {
+        $.each(data.responseJSON.errors, function (k, v) {
+            msg += v + '\\n';
+        });
+    }
+    return msg
+};
+
 toastr.options = {
     closeButton: true,
     progressBar: true,
@@ -18,45 +28,47 @@ $(document).pjax('a:not(a[target="_blank"])', {
     container: '#pjax-container'
 });
 
-NProgress.configure({ parent: '#pjax-container' });
+NProgress.configure({parent: '#pjax-container'});
 
-$(document).on('pjax:timeout', function(event) { event.preventDefault(); })
+$(document).on('pjax:timeout', function (event) {
+    event.preventDefault();
+})
 
-$(document).on('submit', 'form[pjax-container]', function(event) {
+$(document).on('submit', 'form[pjax-container]', function (event) {
     $.pjax.submit(event, '#pjax-container')
 });
 
-$(document).on("pjax:popstate", function() {
+$(document).on("pjax:popstate", function () {
 
-    $(document).one("pjax:end", function(event) {
-        $(event.target).find("script[data-exec-on-popstate]").each(function() {
+    $(document).one("pjax:end", function (event) {
+        $(event.target).find("script[data-exec-on-popstate]").each(function () {
             $.globalEval(this.text || this.textContent || this.innerHTML || '');
         });
     });
 });
 
-$(document).on('pjax:send', function(xhr) {
-    if(xhr.relatedTarget && xhr.relatedTarget.tagName && xhr.relatedTarget.tagName.toLowerCase() === 'form') {
+$(document).on('pjax:send', function (xhr) {
+    if (xhr.relatedTarget && xhr.relatedTarget.tagName && xhr.relatedTarget.tagName.toLowerCase() === 'form') {
         $submit_btn = $('form[pjax-container] :submit');
-        if($submit_btn) {
+        if ($submit_btn) {
             $submit_btn.button('loading')
         }
     }
     NProgress.start();
 });
 
-$(document).on('pjax:complete', function(xhr) {
-    if(xhr.relatedTarget && xhr.relatedTarget.tagName && xhr.relatedTarget.tagName.toLowerCase() === 'form') {
+$(document).on('pjax:complete', function (xhr) {
+    if (xhr.relatedTarget && xhr.relatedTarget.tagName && xhr.relatedTarget.tagName.toLowerCase() === 'form') {
         $submit_btn = $('form[pjax-container] :submit');
-        if($submit_btn) {
+        if ($submit_btn) {
             $submit_btn.button('reset')
         }
     }
     NProgress.done();
 });
 
-$(function(){
-    $('.sidebar-menu li:not(.treeview) > a').on('click', function(){
+$(function () {
+    $('.sidebar-menu li:not(.treeview) > a').on('click', function () {
         var $parent = $(this).parent().addClass('active');
         $parent.siblings('.treeview.active').find('> a').trigger('click');
         $parent.siblings().removeClass('active').find('li').removeClass('active');
@@ -65,7 +77,7 @@ $(function(){
     $('[data-toggle="popover"]').popover();
 });
 
-(function($){
+(function ($) {
     $.fn.admin = LA;
     $.admin = LA;
 

resources/lang/ru/admin.php

@@ -40,7 +40,7 @@
     'description'       => 'Описание',
     'back'              => 'Назад',
     'back_to_list'      => 'Вернуться к списку',
-    'submit'            => 'Сохранить',
+    'submit'            => 'Создать',
     'menu'              => 'Меню',
     'input'             => 'Ввод',
     'succeeded'         => 'Завершена',

resources/views/widgets/form.blade.php

@@ -9,7 +9,9 @@
 
     <!-- /.box-body -->
     <div class="box-footer">
+    @if( ! $method == 'GET')
         <input type="hidden" name="_token" value="{{ csrf_token() }}">
+    @endif
         <div class="col-md-2"></div>
 
         <div class="col-md-8">
@@ -23,4 +25,4 @@
         </div>
 
     </div>
-</form>
+</form>

src/Auth/Database/HasPermissions.php

@@ -145,4 +145,20 @@ public function visible(array $roles = []) : bool
 
         return $this->inRoles($roles) || $this->isAdministrator();
     }
+
+    /**
+     * Detach models from the relationship.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::deleting(function ($model) {
+            $model->roles()->detach();
+
+            $model->permissions()->detach();
+        });
+    }
 }

src/Auth/Database/Menu.php

@@ -66,4 +66,18 @@ public function allNodes() : array
 
         return static::with('roles')->orderByRaw($byOrder)->get()->toArray();
     }
+
+    /**
+     * Detach models from the relationship.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::deleting(function ($model) {
+            $model->roles()->detach();
+        });
+    }
 }

src/Auth/Database/Permission.php

@@ -130,4 +130,18 @@ public function getHttpMethodAttribute($method)
 
         return $method;
     }
+
+    /**
+     * Detach models from the relationship.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::deleting(function ($model) {
+            $model->roles()->detach();
+        });
+    }
 }

src/Auth/Database/Role.php

@@ -76,4 +76,20 @@ public function cannot(string $permission) : bool
     {
         return !$this->can($permission);
     }
+
+    /**
+     * Detach models from the relationship.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::deleting(function ($model) {
+            $model->administrators()->detach();
+
+            $model->permissions()->detach();
+        });
+    }
 }

src/Auth/Permission.php

@@ -52,6 +52,16 @@ public static function allow($roles)
         }
     }
 
+    /**
+     * Don't check permission.
+     *
+     * @return bool
+     */
+    public static function free()
+    {
+        return true;
+    }
+
     /**
      * Roles denied to access.
      *

src/Form.php

@@ -502,6 +502,8 @@ public function update($id)
     {
         $data = Input::all();
 
+        $isEditable = $this->isEditable($data);
+
         $data = $this->handleEditable($data);
 
         $data = $this->handleFileDelete($data);
@@ -520,7 +522,11 @@ public function update($id)
 
         // Handle validation errors.
         if ($validationMessages = $this->validationMessages($data)) {
-            return back()->withInput()->withErrors($validationMessages);
+            if (!$isEditable) {
+                return back()->withInput()->withErrors($validationMessages);
+            } else {
+                return response()->json(['errors' => array_dot($validationMessages->getMessages())], 422);
+            }
         }
 
         if (($response = $this->prepare($data)) instanceof Response) {
@@ -565,6 +571,18 @@ protected function redirectAfterUpdate()
         return redirect($url);
     }
 
+    /**
+     * Check if request is from editable.
+     *
+     * @param array $input
+     *
+     * @return bool
+     */
+    protected function isEditable(array $input = [])
+    {
+        return array_key_exists('_editable', $input);
+    }
+
     /**
      * Handle editable update.
      *

src/Form/Field/Checkbox.php

@@ -36,18 +36,26 @@ public function options($options = [])
 
     /**
      * Draw inline checkboxes.
+     *
+     * @return $this
      */
     public function inline()
     {
         $this->inline = true;
+
+        return $this;
     }
 
     /**
      * Draw stacked checkboxes.
+     *
+     * @return $this
      */
     public function stacked()
     {
         $this->inline = false;
+
+        return $this;
     }
 
     /**