Merge pull request #2 from jqhph/master

0509

resources/assets/dcat/sass/components/_menu.scss

@@ -77,6 +77,7 @@ body.sidebar-collapse {
 .main-sidebar {
   .nav-sidebar .nav-item > .nav-link {
     font-size: 1.1rem;
+    border-radius: .1rem;
   }
 }
 

resources/views/layouts/full-page.blade.php

@@ -37,7 +37,7 @@
 {!! admin_section(\AdminSection::BODY_INNER_BEFORE) !!}
 
 <div class="app-content content">
-    <div class="wrapper" id="{{ $pjaxContainerId }}">
+    <div class="wrapper">
         @yield('app')
     </div>
 </div>

src/Admin.php

@@ -35,7 +35,7 @@ class Admin
      *
      * @var string
      */
-    const VERSION = '1.3.0';
+    const VERSION = '1.3.2';
 
     /**
      * @var array

src/Console/MinifyCommand.php

@@ -151,16 +151,20 @@ class MinifyCommand extends Command
         $mixFile = $this->getMixFile();
         $mixBakFile = $this->getMixBakFile();
 
-        $this->files->delete($mixFile);
-        $this->files->copy($mixBakFile, $mixFile);
-        $this->files->delete($mixBakFile);
+        if (is_file($mixBakFile)) {
+            $this->files->delete($mixFile);
+            $this->files->copy($mixBakFile, $mixFile);
+            $this->files->delete($mixBakFile);
+        }
 
         $colorFile = $this->getColorFile();
         $colorBakFile = $this->getColorBakFile();
 
-        $this->files->delete($colorFile);
-        $this->files->copy($colorBakFile, $colorFile);
-        $this->files->delete($colorBakFile);
+        if (is_file($colorBakFile)) {
+            $this->files->delete($colorFile);
+            $this->files->copy($colorBakFile, $colorFile);
+            $this->files->delete($colorBakFile);
+        }
     }
 
     /**

src/Controllers/MenuController.php

@@ -76,6 +76,7 @@ class MenuController extends AdminController
 
         $tree->disableCreateButton();
         $tree->disableQuickCreateButton();
+        $tree->disableEditButton();
 
         $tree->branch(function ($branch) {
             $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";
@@ -105,9 +106,9 @@ class MenuController extends AdminController
     {
         $menuModel = config('admin.database.menu_model');
 
-        $repository = $menuModel::withPermission() ? new Menu('permissions') : new Menu();
+        $relations = $menuModel::withPermission() ? ['permissions', 'roles'] : 'roles';
 
-        return Form::make($repository, function (Form $form) use ($menuModel) {
+        return Form::make(new Menu($relations), function (Form $form) use ($menuModel) {
             $permissionModel = config('admin.database.permissions_model');
             $roleModel = config('admin.database.roles_model');
 
@@ -119,6 +120,8 @@ class MenuController extends AdminController
 
             $form->select('parent_id', trans('admin.parent_id'))->options(function () use ($menuModel) {
                 return $menuModel::selectOptions();
+            })->saving(function ($v) {
+                return (int) $v;
             });
             $form->text('title', trans('admin.title'))->required();
             $form->icon('icon', trans('admin.icon'))->help($this->iconHelp());

src/Controllers/PermissionController.php

@@ -68,6 +68,7 @@ class PermissionController extends AdminController
         $tree = new Tree(new $model());
 
         $tree->disableCreateButton();
+        $tree->disableEditButton();
 
         $tree->branch(function ($branch) {
             $payload = "<div class='pull-left' style='min-width:310px'><b>{$branch['name']}</b>&nbsp;&nbsp;[<span class='text-primary'>{$branch['slug']}</span>]";

src/Grid/Displayers/QRCode.php

@@ -27,9 +27,7 @@ JS;
         $content = $this->column->getOriginal();
 
         if ($formatter instanceof \Closure) {
-            $formatter->bindTo($this->row);
-
-            $content = call_user_func($formatter, $content);
+            $content = $formatter->call($this->row, $content);
         }
 
         $img = "<img src='https://api.qrserver.com/v1/create-qr-code/?size={$width}x{$height}&data={$content}' style='height: {$width}px;width: {$height}px;'/>";

src/Grid/Exporters/AbstractExporter.php

@@ -189,7 +189,6 @@ abstract class AbstractExporter implements ExporterInterface
         $array = $this->grid->processFilter(true);
 
         $model->reset();
-        $model->rejectQuery('forPage');
 
         return $this->callBuilder($array);
     }

src/Grid/Model.php

@@ -140,7 +140,15 @@ class Model
         }
 
         $this->request = $request;
-        $this->queries = collect();
+        $this->initQueries();
+    }
+
+    /**
+     * @return void
+     */
+    protected function initQueries()
+    {
+        $this->queries = new Collection();
     }
 
     /**
@@ -720,5 +728,6 @@ class Model
     {
         $this->data = null;
         $this->model = null;
+        $this->initQueries();
     }
 }

src/Grid/Tools/ExportButton.php

@@ -102,7 +102,7 @@ JS;
         $export = trans('admin.export');
 
         return <<<EOT
-<div class="btn-group dropdown shadow-none" style="margin-right:3px">
+<div class="btn-group dropdown" style="margin-right:3px">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
         <i class="feather icon-download"></i>
         <span class="d-none d-sm-inline">&nbsp;{$export}&nbsp;</span>