From 83ab70082df91ea496d19b9c8d093d6155f1e3d2 Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Thu, 24 Apr 2014 12:29:43 +0200 Subject: [PATCH] Changed "Cache" by "Advanced configuration" --- .../Thelia/Config/Resources/routing/admin.xml | 8 +- .../Controller/Admin/CacheController.php | 61 --- .../Core/Security/Resource/AdminResources.php | 8 +- templates/backOffice/default/I18n/fr_FR.php | 4 +- templates/backOffice/default/cache.html | 31 -- .../backOffice/default/configuration.html | 400 +++++++++--------- 6 files changed, 212 insertions(+), 300 deletions(-) delete mode 100644 core/lib/Thelia/Controller/Admin/CacheController.php delete mode 100644 templates/backOffice/default/cache.html diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index f9301caa6..267bb2008 100644 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -992,12 +992,12 @@ - - Thelia\Controller\Admin\CacheController::defaultAction + + Thelia\Controller\Admin\AdvancedConfigurationController::defaultAction - - Thelia\Controller\Admin\CacheController::flushAction + + Thelia\Controller\Admin\AdvancedConfigurationController::flushCacheAction diff --git a/core/lib/Thelia/Controller/Admin/CacheController.php b/core/lib/Thelia/Controller/Admin/CacheController.php deleted file mode 100644 index 8680d834c..000000000 --- a/core/lib/Thelia/Controller/Admin/CacheController.php +++ /dev/null @@ -1,61 +0,0 @@ - - */ -class CacheController extends BaseAdminController -{ - - public function defaultAction() - { - if (null !== $result = $this->checkAuth(AdminResources::CACHE, [], AccessManager::VIEW)) { - return $result; - } - - return $this->render('cache'); - } - - public function flushAction() - { - if (null !== $result = $this->checkAuth(AdminResources::CACHE, [], AccessManager::UPDATE)) { - return $result; - } - - $form = new CacheFlushForm($this->getRequest()); - try { - $this->validateForm($form); - - $event = new CacheEvent($this->container->getParameter("kernel.cache_dir")); - $this->dispatch(TheliaEvents::CACHE_CLEAR, $event); - - $event = new CacheEvent(THELIA_WEB_DIR . "assets"); - $this->dispatch(TheliaEvents::CACHE_CLEAR, $event); - - $this->redirectToRoute('admin.configuration.cache'); - } catch (FormValidationException $e) { - - } - } - -} diff --git a/core/lib/Thelia/Core/Security/Resource/AdminResources.php b/core/lib/Thelia/Core/Security/Resource/AdminResources.php index de78123b4..5e78efd7e 100644 --- a/core/lib/Thelia/Core/Security/Resource/AdminResources.php +++ b/core/lib/Thelia/Core/Security/Resource/AdminResources.php @@ -45,12 +45,12 @@ final class AdminResources const ADMINISTRATOR = "admin.configuration.administrator"; + const ADVANCED_CONFIGURATION = "admin.configuration.advanced"; + const AREA = "admin.configuration.area"; const ATTRIBUTE = "admin.configuration.attribute"; - const CACHE = "admin.cache"; - const CATEGORY = "admin.category"; const CONFIG = "admin.configuration"; @@ -91,7 +91,9 @@ final class AdminResources const TEMPLATE = "admin.configuration.template"; - const SYSTEM_LOG = "admin.configuration.system-log"; + const SYSTEM_LOG = "admin.configuration.system-logs"; + + const ADMIN_LOG = "admin.configuration.admin-logs"; const STORE = "admin.configuration.store"; diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index ff1cededd..812e7f221 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -50,6 +50,7 @@ return array( 'Administration logs' => 'Journal des logs', 'Administration profiles' => 'Profils d\'administration', 'Administrators' => 'Administrateurs', + 'Advanced configuration' => 'Configuration avancée', 'Afficher ce profil' => 'Afficher ce profil', 'All countries are assigned to a shipping zone.' => 'Tous les pays sont assignés à une zone de livraison.', 'All orders' => 'Toutes les commandes', @@ -472,7 +473,8 @@ return array( 'First orders' => 'Premières commandes', 'FirstName' => 'Prénom', 'Firstname' => 'Prénom', - 'Flush the cache' => 'Vider le cache', + 'Flush the Thelia internal cache' => 'Vider le cache interne de Thelia', + 'Flush the cache now' => 'Vider le cache maintenant', 'Folder created on %date_create. Last modification: %date_change' => 'Dossier créé le %date_create. Dernière modification le %date_change', 'Folder title' => 'Titre du dossier', 'Folders' => 'Dossiers', diff --git a/templates/backOffice/default/cache.html b/templates/backOffice/default/cache.html deleted file mode 100644 index 95c9b5178..000000000 --- a/templates/backOffice/default/cache.html +++ /dev/null @@ -1,31 +0,0 @@ -{extends file="admin-layout.tpl"} - -{block name="page-title"}{intl l='Cache'}{/block} - -{block name="check-resource"}admin.cache{/block} -{block name="check-access"}view{/block} - -{block name="main-content"} -
- -
- - - -
-
- {form name="thelia.cache.flush"} -
- {form_hidden_fields form=$form} - -
- {/form} -
-
-
-
-{/block} diff --git a/templates/backOffice/default/configuration.html b/templates/backOffice/default/configuration.html index e4d51dda8..c1fb66edd 100644 --- a/templates/backOffice/default/configuration.html +++ b/templates/backOffice/default/configuration.html @@ -1,201 +1,201 @@ -{extends file="admin-layout.tpl"} - -{block name="page-title"}{intl l='Configuration'}{/block} - -{block name="check-resource"}admin.configuration{/block} -{block name="check-access"}view{/block} - -{block name="main-content"} -
- -
- - {module_include location='configuration_top'} - -

{intl l="Thelia configuration"}

- -
- -
- -
- -
- -
- -
- -
- - {module_include location='configuration_bottom'} -
-
-
-{/block} - -{block name="javascript-last-call"} - {module_include location='configuration-js'} +{extends file="admin-layout.tpl"} + +{block name="page-title"}{intl l='Configuration'}{/block} + +{block name="check-resource"}admin.configuration{/block} +{block name="check-access"}view{/block} + +{block name="main-content"} +
+ +
+ + {module_include location='configuration_top'} + +

{intl l="Thelia configuration"}

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + {module_include location='configuration_bottom'} +
+
+
+{/block} + +{block name="javascript-last-call"} + {module_include location='configuration-js'} {/block} \ No newline at end of file