minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: fix registering template paths

Browse Source
This commit is contained in:
Michal Kváček
2017-02-10 11:41:17 +01:00
parent b5425423d6
commit 9451357e02
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Providers/TemplateServiceProvider.php
+8 -6
View File
@@ -45,28 +45,30 @@ class TemplateServiceProvider extends ServiceProvider
public function registerTemplatePaths($publicTemplates) public function registerTemplatePaths($publicTemplates)
{ {
$modules = Module::all() $modules = Module::where('enabled', true)
->pluck('id', 'alias'); ->get()
->pluck('id', 'alias')
->toArray();
/** /**
* @var $registrator TemplateRegistrator * @var $registrator TemplateRegistrator
*/ */
$registrator = $this->app->make('registerTemplateDir'); $registrator = $this->app->make('registerTemplateDir');
foreach ($publicTemplates as $template) { foreach ($publicTemplates as $template) {
// setup some global variables // setup some global variables
$module = strtolower($template['module']); $module = strtolower($template['module']);
$alias = isset($template['alias']) ? $template['alias'] : $module; $alias = isset($template['alias']) ? $template['alias'] : $module;
$namespace = isset($template['namespace']) ? $template['namespace'] : strtolower($template['module']); $namespace = isset($template['namespace']) ? $template['namespace'] : strtolower($template['module']);
if (!$modules->get($alias)) { if (!isset($modules[$alias])) {
continue; continue;
} }
// register path with current template name // register path with current template name
$registrator->setNamespace($namespace); $registrator->setNamespace($namespace);
$registrator->setModuleId($modules->get($alias)); $registrator->setModuleId($modules[$alias]);
$registrator->register('resources/views/modules/' . $module, 'visitor', $template['templateName']); $registrator->register('resources/views/modules/' . $alias, 'visitor', $template['templateName']);
} }
// register also global resources/views/visitor directory // register also global resources/views/visitor directory
templates/Binarity/Handler.php
+3 -2
View File
@@ -2,7 +2,6 @@
namespace Templates\Binarity; namespace Templates\Binarity;
use App\CMS\Contracts\Modules\TemplateHandler; use App\CMS\Contracts\Modules\TemplateHandler;
use App\Http\Requests\Request;
use App\Models\Content\Content; use App\Models\Content\Content;
use App\Models\Module; use App\Models\Module;
use App\Models\User; use App\Models\User;
@@ -76,10 +75,12 @@ class Handler implements TemplateHandler
], ],
[ [
'module' => 'ArticleList', 'module' => 'ArticleList',
'alias' => 'blog-articlelist',
'templateName' => 'articlelist::module.templatePath' 'templateName' => 'articlelist::module.templatePath'
], ],
[ [
'module' => 'Article', 'module' => 'Article',
'alias' => 'blog-article',
'templateName' => 'article::module.templatePath' 'templateName' => 'article::module.templatePath'
], ],
]; ];
@@ -112,7 +113,7 @@ class Handler implements TemplateHandler
* This way we can do almost whatever we want - even in template * This way we can do almost whatever we want - even in template
* *
* @param Content $content * @param Content $content
* @param $request * @param $request
*/ */
public static function beforeSave(Content & $content, $inputData) public static function beforeSave(Content & $content, $inputData)
{ {