From ebc7929adac6246d84087a36d11eb8df8b897fe4 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Fri, 27 May 2016 07:49:13 +1000 Subject: [PATCH] MaintenanceSettings -> MaintenanceSetting --- modules/cms/ServiceProvider.php | 2 +- modules/cms/classes/Controller.php | 8 ++++---- .../{MaintenanceSettings.php => MaintenanceSetting.php} | 2 +- .../fields.yaml | 0 modules/system/reportwidgets/Status.php | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename modules/cms/models/{MaintenanceSettings.php => MaintenanceSetting.php} (97%) rename modules/cms/models/{maintenancesettings => maintenancesetting}/fields.yaml (100%) diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php index 52615076b..dd14c255d 100644 --- a/modules/cms/ServiceProvider.php +++ b/modules/cms/ServiceProvider.php @@ -234,7 +234,7 @@ class ServiceProvider extends ModuleServiceProvider 'description' => 'cms::lang.maintenance.settings_menu_description', 'category' => SettingsManager::CATEGORY_CMS, 'icon' => 'icon-plug', - 'class' => 'Cms\Models\MaintenanceSettings', + 'class' => 'Cms\Models\MaintenanceSetting', 'permissions' => ['cms.manage_themes'], 'order' => 300 ], diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index 1d1fa59c8..0aa914f2c 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -18,7 +18,7 @@ use Twig_Environment; use Cms\Twig\Loader as TwigLoader; use Cms\Twig\DebugExtension; use Cms\Twig\Extension as CmsTwigExtension; -use Cms\Models\MaintenanceSettings; +use Cms\Models\MaintenanceSetting; use System\Models\RequestLog; use System\Classes\ErrorHandler; use System\Classes\CombineAssets; @@ -164,15 +164,15 @@ class Controller * Maintenance mode */ if ( - MaintenanceSettings::isConfigured() && - MaintenanceSettings::get('is_enabled', false) && + MaintenanceSetting::isConfigured() && + MaintenanceSetting::get('is_enabled', false) && !BackendAuth::getUser() ) { if (!Request::ajax()) { $this->setStatusCode(503); } - $page = Page::loadCached($this->theme, MaintenanceSettings::get('cms_page')); + $page = Page::loadCached($this->theme, MaintenanceSetting::get('cms_page')); } /* diff --git a/modules/cms/models/MaintenanceSettings.php b/modules/cms/models/MaintenanceSetting.php similarity index 97% rename from modules/cms/models/MaintenanceSettings.php rename to modules/cms/models/MaintenanceSetting.php index df5d337b3..396ca02f2 100644 --- a/modules/cms/models/MaintenanceSettings.php +++ b/modules/cms/models/MaintenanceSetting.php @@ -11,7 +11,7 @@ use ApplicationException; * @package october\cms * @author Alexey Bobkov, Samuel Georges */ -class MaintenanceSettings extends Model +class MaintenanceSetting extends Model { use \October\Rain\Database\Traits\Validation; diff --git a/modules/cms/models/maintenancesettings/fields.yaml b/modules/cms/models/maintenancesetting/fields.yaml similarity index 100% rename from modules/cms/models/maintenancesettings/fields.yaml rename to modules/cms/models/maintenancesetting/fields.yaml diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php index 294bed4da..90e765048 100644 --- a/modules/system/reportwidgets/Status.php +++ b/modules/system/reportwidgets/Status.php @@ -3,7 +3,7 @@ use BackendAuth; use System\Models\Parameters; use System\Classes\UpdateManager; -use Cms\Models\MaintenanceSettings; +use Cms\Models\MaintenanceSetting; use Backend\Classes\ReportWidgetBase; use Exception; @@ -46,7 +46,7 @@ class Status extends ReportWidgetBase protected function loadData() { $manager = UpdateManager::instance(); - $this->vars['inMaintenance'] = MaintenanceSettings::get('is_enabled'); + $this->vars['inMaintenance'] = MaintenanceSetting::get('is_enabled'); $this->vars['showUpdates'] = BackendAuth::getUser()->hasAccess('system.manage_updates'); $this->vars['updates'] = $manager->check(); }