Parcourir la source

Merge branch 'master' into 2.0

# Conflicts:
#	src/Form/Field/ListField.php
jqh il y a 4 ans
Parent
commit
7432222712

+ 1 - 1
resources/assets/adminlte/scss/_variables.scss

@@ -146,7 +146,7 @@ $sidebar-dark-header-color: hsla(0,0%,100%,.8) !default;
 // Light sidebar
 $sidebar-light-bg: $white !default;
 $sidebar-light-hover-bg: transparent !default;
-$sidebar-light-color: lighten($font-color, 5%) !default;
+$sidebar-light-color: lighten($font-color, 8%) !default;
 $sidebar-light-hover-color: $gray-900 !default;
 $sidebar-light-active-color: $white !default;
 $sidebar-light-submenu-bg: transparent !default;

+ 7 - 7
resources/assets/dcat/js/extensions/RowSelector.js

@@ -22,14 +22,14 @@ export default class RowSelector {
     init() {
         let options = this.options,
             checkboxSelector = options.checkboxSelector,
-            $selectAll = $(options.selectAllSelector),
-            $checkbox = $(checkboxSelector);
+            $document = $(document),
+            selectAll = options.selectAllSelector;
 
-        $selectAll.on('change', function() {
+        $document.on('change', selectAll, function() {
             $(this).parents(options.container).find(checkboxSelector).prop('checked', this.checked).trigger('change');
         });
         if (options.clickRow) {
-            $checkbox.click(function (e) {
+            $document.on('click', checkboxSelector, function (e) {
                 if (typeof e.cancelBubble != "undefined") {
                     e.cancelBubble = true;
                 }
@@ -41,13 +41,13 @@ export default class RowSelector {
             });
         }
 
-        $checkbox.on('change', function () {
+        $document.on('change', checkboxSelector, function () {
             var tr = $(this).closest('tr');
             if (this.checked) {
                 tr.css('background-color', options.background);
 
-                if ($(checkboxSelector + ':checked').length === $checkbox.length) {
-                    $selectAll.prop('checked', true)
+                if ($(checkboxSelector + ':checked').length === $(checkboxSelector).length) {
+                    $(selectAll).prop('checked', true)
                 }
             } else {
                 tr.css('background-color', '');

+ 4 - 1
src/Console/ExportSeedCommand.php

@@ -32,10 +32,13 @@ class ExportSeedCommand extends Command
         $exceptFields = [];
         $exportUsers = $this->option('users');
 
-        $seedFile = $this->laravel->databasePath().'/seeds/'.$name.'.php';
+        $namespace = version_compare(app()->version(), '8.0.0', '<') ? 'seeds' : 'seeders';
+
+        $seedFile = $this->laravel->databasePath().'/'.$namespace.'/'.$name.'.php';
         $contents = $this->getStub('AdminTablesSeeder');
 
         $replaces = [
+            'DummyNamespace' => ucwords($namespace),
             'DummyClass' => $name,
 
             'ClassMenu'       => config('admin.database.menu_model'),

+ 3 - 0
src/Console/stubs/AdminTablesSeeder.stub

@@ -1,6 +1,9 @@
 <?php
 
+namespace Database\DummyNamespace;
+
 use Illuminate\Database\Seeder;
+use DB;
 
 class DummyClass extends Seeder
 {

+ 1 - 3
src/Grid/Filter/Presenter/SelectTable.php

@@ -21,8 +21,6 @@ class SelectTable extends Presenter
 
     protected $style = 'primary';
 
-    protected $title;
-
     protected $id;
 
     protected $options;
@@ -96,7 +94,7 @@ class SelectTable extends Presenter
      */
     public function title($title)
     {
-        $this->title = $title;
+        $this->dialog->title($title);
 
         return $this;
     }