From c64adc95aea1336c8c3c935d19d9d8a67b7b0553 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 29 Aug 2019 16:23:12 +0200 Subject: [PATCH] fix #2990 @1 --- .env.production | 6 +- .env.staging | 7 +- app/Console/Commands/CMSMigration.php | 4 +- .../base/inc/sidebar_content.blade.php | 85 ++++++++++--------- 4 files changed, 52 insertions(+), 50 deletions(-) diff --git a/.env.production b/.env.production index 2480041..f46442f 100644 --- a/.env.production +++ b/.env.production @@ -54,9 +54,9 @@ ELASTICSEARCH_USER= ELASTICSEARCH_PASS= ELASTICSEARCH_INDEX_NAME=pmi -FEATURE_QUOTE=false -FEATURE_NEWS=false -FEATURE_SEARCH=false +FEATURE_QUOTE=true +FEATURE_NEWS=true +FEATURE_SEARCH=true FEATURE_I18N=false FEATURE_TEAM=false FEATURE_CLIENTS=false diff --git a/.env.staging b/.env.staging index 1c94da6..460ed5a 100644 --- a/.env.staging +++ b/.env.staging @@ -53,10 +53,11 @@ ELASTICSEARCH_USER= ELASTICSEARCH_PASS= ELASTICSEARCH_INDEX_NAME=pmi_staging -FEATURE_QUOTE=false -FEATURE_NEWS=false -FEATURE_SEARCH=false +FEATURE_QUOTE=true +FEATURE_NEWS=true +FEATURE_SEARCH=true FEATURE_I18N=false FEATURE_TEAM=false FEATURE_CLIENTS=false FEATURE_PARTNERS=false + diff --git a/app/Console/Commands/CMSMigration.php b/app/Console/Commands/CMSMigration.php index 739b599..09dfd3a 100644 --- a/app/Console/Commands/CMSMigration.php +++ b/app/Console/Commands/CMSMigration.php @@ -17,8 +17,8 @@ class CMSMigration extends Command echo 'Run backup of staging' . "\n"; `cd /home/pmi/www;php artisan backup:run`; - $tables = ['cubist_cms_pages', 'cubist_news', 'cubist_settings', 'cubist_locales', 'cubist_translate']; - $models = ['App\Models\Page', 'App\Models\News', 'App\Models\Locale', 'App\Models\Settings', 'App\Models\Translate']; + $tables = ['cubist_cms_pages', 'cubist_news', 'cubist_settings', 'cubist_locales', 'cubist_translate', 'applications']; + $models = ['App\Models\Page', 'App\Models\News', 'App\Models\Locale', 'App\Models\Settings', 'App\Models\Translate', 'App\Models\Application']; foreach ($models as $k => $model) { $models[$k] = '\'' . addcslashes($model, '\\') . '\''; } diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index 32b0402..d68bb28 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -2,25 +2,28 @@
  • {{ trans('backpack::base.dashboard') }}
    • -@can('dev') -
  • Edition
    • -@endcan + @can('backpack_edition') - @can('dev') -
  • Pages
    • -
  • News
    • -
  • Applications
    • - @can('backpack_settings') -
  • Paramètres
    • - @endcan -
  • - Traductions - -
    • +
  • Edition
    • +
  • Pages
    • +
  • News
    • +
  • Applications
    • + @can('backpack_settings') +
  • Paramètres
    • @endcan +
  • + Traductions + +
  • Édition du catalogue de produits
  • Produits
  • Types de produit @@ -28,33 +31,31 @@
  • Spécifications
    • -
  • - Demandes de devis -
    • -{{--
  • --}} -{{-- Catégories--}} -{{--
    • --}} + {{--
  • --}} + {{-- Catégories--}} + {{--
    • --}} @endcan -@can('dev') - @can('backpack_maintenance') -
  • Administration
    • -
  • - Users, Roles, Permissions - -
    • -
  • Maintenance
    • -
  • Backups
    • -
  • Logs
    • - @endcan -{{--
  • --}} -{{-- {{ trans('backpack::crud.file_manager') }}
    • --}} +@can('backpack_sales') +
  • Gestion des demandes de devis
    • +
  • Demandes de devis +
    • @endcan +@can('backpack_maintenance') +
  • Administration
    • +
  • + Users, Roles, Permissions + +
    • +
  • Maintenance
    • +
  • Backups
    • +
  • Logs
    • +@endcan -- 2.39.5