FIX: fix bug related to settings cache
This commit is contained in:
@@ -79,7 +79,7 @@ class Settings
|
|||||||
{
|
{
|
||||||
if (!self::$initialized) {
|
if (!self::$initialized) {
|
||||||
self::$settings = Cache::remember('settings', config('cache.settingCacheLifetime'), function () {
|
self::$settings = Cache::remember('settings', config('cache.settingCacheLifetime'), function () {
|
||||||
app(SettingsRepository::class)->getAll();
|
return app(SettingsRepository::class)->getAll();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\CMS\Repositories;
|
namespace App\CMS\Repositories;
|
||||||
|
|
||||||
use App\CMS\Contracts\Repositories\Module as IModule;
|
use App\CMS\Contracts\Repositories\Module as IModule;
|
||||||
use App\Models\Content\Content;
|
use App\Models\Content\Content;
|
||||||
use App\Models\Module as ModuleModel;
|
use App\Models\Module as ModuleModel;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
|
|
||||||
class Module extends Repository implements IModule
|
class Module extends Repository implements IModule
|
||||||
{
|
{
|
||||||
@@ -52,8 +54,10 @@ class Module extends Repository implements IModule
|
|||||||
|
|
||||||
public function all()
|
public function all()
|
||||||
{
|
{
|
||||||
return ModuleModel::where('enabled', true)
|
return Cache::rememberForever('enabled-modules-and-template', function () {
|
||||||
->get();
|
return ModuleModel::where('enabled', true)
|
||||||
|
->get();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getByHandler($handler)
|
public function getByHandler($handler)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\CMS\Repositories\Settings;
|
namespace App\CMS\Repositories\Settings;
|
||||||
|
|
||||||
use App\Models\Settings as SettingsModel;
|
use App\Models\Settings as SettingsModel;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
|
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
|
||||||
|
|
||||||
class Settings
|
class Settings
|
||||||
@@ -104,5 +105,7 @@ class Settings
|
|||||||
$setting->value = $value;
|
$setting->value = $value;
|
||||||
empty($value) ? $setting->delete() : $setting->save();
|
empty($value) ? $setting->delete() : $setting->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Cache::forget('settings');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,6 +39,9 @@ class DisableModule extends Command
|
|||||||
$module->enabled = false;
|
$module->enabled = false;
|
||||||
$module->save();
|
$module->save();
|
||||||
|
|
||||||
|
\Cache::forget('enabled-modules');
|
||||||
|
\Cache::forget('enabled-modules-and-template');
|
||||||
|
|
||||||
$this->line('Module ' . $module->static_name . ' disabled.');
|
$this->line('Module ' . $module->static_name . ' disabled.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,6 +43,9 @@ class EnableModule extends Command
|
|||||||
$module->enabled = true;
|
$module->enabled = true;
|
||||||
$module->save();
|
$module->save();
|
||||||
|
|
||||||
|
\Cache::forget('enabled-modules');
|
||||||
|
\Cache::forget('enabled-modules-and-template');
|
||||||
|
|
||||||
$this->line('Module ' . $module->static_name . ' enabled.');
|
$this->line('Module ' . $module->static_name . ' enabled.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class Module extends Model
|
|||||||
'parent_id',
|
'parent_id',
|
||||||
'name',
|
'name',
|
||||||
'description',
|
'description',
|
||||||
'static_name', // @todo instalace potrebuje naplnit tento sloupec!
|
'static_name',
|
||||||
'alias',
|
'alias',
|
||||||
'module_settings',
|
'module_settings',
|
||||||
'enabled',
|
'enabled',
|
||||||
|
|||||||
Reference in New Issue
Block a user