FEATURE: do not require template to be set in admin
This commit is contained in:
@@ -13,19 +13,15 @@ class TemplateServiceProvider extends ServiceProvider
|
||||
{
|
||||
public function boot()
|
||||
{
|
||||
$template = CurrentTemplate::get();
|
||||
|
||||
// ignore running from artisan
|
||||
if (App::runningInConsole() || App::environment('testing')) {
|
||||
if (App::runningInConsole() || App::environment('testing') || !$template) {
|
||||
$this->publishViewResources();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$template = CurrentTemplate::get();
|
||||
|
||||
if (!$template) {
|
||||
throw new \ErrorException('Template is not set, cannot continue');
|
||||
}
|
||||
|
||||
// include files
|
||||
$files = isset($template->moduleSettings->files) ? $template->moduleSettings->files : [];
|
||||
|
||||
@@ -43,6 +39,11 @@ class TemplateServiceProvider extends ServiceProvider
|
||||
$this->registerTemplatePaths($publicTemplates);
|
||||
}
|
||||
|
||||
/**
|
||||
* Register template paths from public templates
|
||||
*
|
||||
* @param $publicTemplates
|
||||
*/
|
||||
public function registerTemplatePaths($publicTemplates)
|
||||
{
|
||||
$modules = app(Module::class)
|
||||
|
||||
Reference in New Issue
Block a user