wip #6693 @0.5

diff --git a/composer.json b/composer.json
index c7056c1be8d25053627b6e3ea52bd3c6c1aacf94..0324daaf97db873b331caeea55941df73e85472e 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "ext-libxml": "*",
         "ext-json": "*",
         "ext-redis": "*",
-        "backpack/crud": "^6.4.2",
+        "backpack/crud": "^6.6.0",
         "backpack/backupmanager": "^v5.0.0",
         "backpack/logmanager": "^v5.0.1",
         "backpack/permissionmanager": "^7.1.1",

diff --git a/src/app/Console/Commands/InstallCommand.php b/src/app/Console/Commands/InstallCommand.php
index 2d6b268f1cf6d07d3cc9bbef06ff38e35bbbbfbe..712a2e9849f5366024b701b5b6b7bdb416fb63de 100644 (file)
--- a/src/app/Console/Commands/InstallCommand.php
+++ b/src/app/Console/Commands/InstallCommand.php
@@ -36,14 +36,14 @@ class InstallCommand extends CubistCommand
             'Install backpack addons' => [
                 // BackupManager
                 'php artisan vendor:publish --provider="Backpack\BackupManager\BackupManagerServiceProvider"',
-                'php artisan backpack:add-sidebar-content "<li><a href=\'{{ backpack_url(\'backup\') }}\'><i class=\'la la-hdd-o\'></i> <span>Backups</span></a></li>"',
+                'php artisan backpack:add-menu-content "<li><a href=\'{{ backpack_url(\'backup\') }}\'><i class=\'la la-hdd-o\'></i> <span>Backups</span></a></li>"',
                 // LogManager
-                'php artisan backpack:add-sidebar-content "<li><a href=\'{{ backpack_url(\'log\') }}\'><i class=\'la la-terminal\'></i> <span>Logs</span></a></li>"',
+                'php artisan backpack:add-menu-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 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>"',
+                'php artisan backpack:add-menu-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
                 'php artisan vendor:publish --provider="Venturecraft\Revisionable\RevisionableServiceProvider"',
                 'php artisan migrate --force',
@@ -62,7 +62,7 @@ class InstallCommand extends CubistCommand
             ],
             'Create first users' => [
                 function () {
-                    $users = ['vincent@cubedesigners.com' => 'Vincent Vanwaelscappel', 'soufiane@cubedesigners.com'=> 'Soufiane Adili'];
+                    $users = ['vincent@cubedesigners.com' => 'Vincent Vanwaelscappel', 'soufiane@cubedesigners.com' => 'Soufiane Adili'];
                     foreach ($users as $email => $name) {
                         try {
                             /** @var CubistMagicAbstractModel $user */
@@ -94,11 +94,7 @@ class InstallCommand extends CubistCommand
                 if ($cmd instanceof \Closure) {
                     $cmd->call($this);
                 } else {
-                    try {
-                        $this->executeProcess($cmd);
-                    } catch (\Exception $e) {
-                        echo $cmd . ' : ' . $e->getMessage() . "\n";
-                    }
+                    $this->executeProcess($cmd);
                 }
             }