wip #4662 @1

diff --git a/src/app/Console/Commands/InstallCommand.php b/src/app/Console/Commands/InstallCommand.php
index 52c48d74a9c5d1a79446d9241766180bb06f1d74..b40a7cf516ffcc56a9ab83a102398d64c788cfbb 100644 (file)
--- a/src/app/Console/Commands/InstallCommand.php
+++ b/src/app/Console/Commands/InstallCommand.php
@@ -29,12 +29,12 @@ class InstallCommand extends CubistCommand
                 'php artisan backpack:add-sidebar-content "<li><a href=\'{{ backpack_url(\'log\') }}\'><i class=\'la la-terminal\'></i> <span>Logs</span></a></li>"',
                 // Permission Manager
                 'php artisan vendor:publish --provider="Spatie\Permission\PermissionServiceProvider" --tag="migrations"',
-                'php artisan migrate',
                 'php artisan vendor:publish --provider="Spatie\Permission\PermissionServiceProvider" --tag="config"',
                 'php artisan vendor:publish --provider="Backpack\PermissionManager\PermissionManagerServiceProvider"',
                 'php artisan backpack:add-sidebar-content "<li class=\'nav-item nav-dropdown\'><a class=\'nav-link nav-dropdown-toggle\' href=\'#\'><i class=\'nav-icon la la-group\'></i>Authentication</a><ul class=\'nav-dropdown-items\'><li class=\'nav-item\'><a class=\'nav-link\' href=\'{{ backpack_url(\'user\') }}\'><i class=\'nav-icon la la-user\'></i><span>Users</span></a></li><li class=\'nav-item\'><a class=\'nav-link\' href=\'{{ backpack_url(\'role\') }}\'><i class=\'nav-icon la la-group\'></i> <span>Roles</span></a></li><li class=\'nav-item\'><a class=\'nav-link\' href=\'{{ backpack_url(\'permission\') }}\'><i class=\'nav-icon la la-key\'></i><span>Permissions</span></a></li></ul></li>"',
                 // Revisions
-                'cp vendor/venturecraft/revisionable/src/migrations/2013_04_09_062329_create_revisions_table.php database/migrations/',
+                'php artisan vendor:publish --provider="Venturecraft\Revisionable\RevisionableServiceProvider"',
+                'php artisan migrate',
             ],
             'Install dev dependencies' => ['composer require --dev ' . implode(' ', $devPackages)],
             "Dropzone" => 'php artisan gaspertrix:backpack:dropzone:install',
@@ -47,6 +47,9 @@ class InstallCommand extends CubistCommand
                 'php artisan migrate',
                 'php artisan cubist:magic:migrate'
             ],
+            'Setup superadmin permission' => [
+                'php artisan permission:create-role superadmin',
+            ],
             'Clear caches' => ['php artisan optimize:clear'],
         ];
 

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index e16437e43052af0b2d9a86a14502046d9e9952f8..b633e09936b05e4c81275525824ebc31d5146a5a 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -191,6 +191,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         if (get_class($this) !== config("auth.providers.users.model")) {
             foreach ($this->_fields as $name => $field) {
                 $field->setPermissions();
+                $field->setPermissions();
             }
         }
     }
@@ -874,6 +875,15 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         return $this->canUpdate($user);
     }
 
+    /**
+     * @param $user CubistMagicAuthenticatable
+     * @return bool
+     */
+    public function canReorder($user)
+    {
+        return $this->canUpdate($user);
+    }
+
     public function isButtonVisible($button)
     {
         if ($button === 'revise') {

diff --git a/src/app/Template/TemplateAbstract.php b/src/app/Template/TemplateAbstract.php
index d61d7836c4ee7306b9146f9b6a11e8c9cee8e479..9737c10032ec596ec6b3315e14039417772714b6 100644 (file)
--- a/src/app/Template/TemplateAbstract.php
+++ b/src/app/Template/TemplateAbstract.php
@@ -93,9 +93,9 @@ class TemplateAbstract
     public static function getTemplates()
     {
         if (null === self::$_templates) {
-            $exclude = ['App\\Templates\\Base', 'Cubist\\Backpack\\app\\Template\\TemplateAbstract', 'Cubist\\Backpack\\app\\Template\\TemplatePage'];
+            $exclude = ['App\\Templates\\Base', TemplateAbstract::class, TemplatePage::class];
             self::$_templates = [];
-            $roots = [__DIR__ => 'Cubist\\Backpack\\app\\Template', app_path() . '/Templates' => 'App\\Templates'];
+            $roots = [__DIR__ => 'Cubist\\Backpack\\Template', app_path() . '/Templates' => 'App\\Templates'];
             foreach ($roots as $templates_root => $prefix) {
                 if (!file_exists($templates_root)) {
                     continue;
@@ -108,16 +108,16 @@ class TemplateAbstract
                     $e = explode('.', $file);
                     $classname = $prefix . "\\" . $e[0];
 
-                    if (is_subclass_of($classname, '\\Cubist\\Backpack\\app\\Template\\TemplateAbstract')) {
+                    if (is_subclass_of($classname, TemplateAbstract::class)) {
                         if (!in_array($classname, $exclude)) {
                             self::$_templates[Str::snake($e[0])] = new $classname();
                         }
                     }
                 }
             }
-            if (!count(self::$_templates)) {
-                abort(503, trans('backpack::pagemanager.template_not_found'));
-            }
+//            if (!count(self::$_templates)) {
+//                abort(503, trans('backpack::pagemanager.template_not_found'));
+//            }
         }
         return self::$_templates;
     }