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

Merge branch 'doucovanineratovice.cz' into dev

Browse Source
This commit is contained in:
Michal Kváček
2016-09-26 16:54:34 +02:00
parent 7f93a5035c 044eb7e532
commit a11a29de19
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/Contents/CreateNewContent.php
+1 -1
View File
@@ -76,7 +76,7 @@ class CreateNewContent extends Controller
// add categories, if supported // add categories, if supported
$categoryModule = ModuleInstance::get('categories'); $categoryModule = ModuleInstance::get('categories');
$categories = []; $categories = [];
if ($module->support_categories && $categoryModule->enabled()) { if ($module->support_categories && !is_null($categoryModule) && $categoryModule->enabled()) {
$categories = Category::where('module_id', $moduleId) $categories = Category::where('module_id', $moduleId)
->get(); ->get();
} }
app/Http/Controllers/Admin/Contents/EditContent.php
+1 -1
View File
@@ -84,7 +84,7 @@ class EditContent extends Controller
// add categories, if supported // add categories, if supported
$categories = []; $categories = [];
if ($module->support_categories && $categoryModule->enabled()) { if ($module->support_categories && !is_null($categoryModule) && $categoryModule->enabled()) {
$categories = Category::where('module_id', $module->id) $categories = Category::where('module_id', $module->id)
->get(); ->get();
} }
templates/Base/OnePage/Handlers/OnePage.php
+9 -1
View File
@@ -58,7 +58,15 @@ abstract class OnePage implements TemplateHandler
$pages = $pages->where('status', Content::STATUS_PUBLIC); $pages = $pages->where('status', Content::STATUS_PUBLIC);
} }
self:: $homepagePages = $pages->get(); $homepagePages = $pages->get()
->getDictionary();
foreach ($pageIds as $pageId) {
if (!isset($homepagePages[$pageId]))
continue;
self::$homepagePages[] = $homepagePages[$pageId];
}
self::$homepagePagesInitialized = true; self::$homepagePagesInitialized = true;
} }
templates/DoucovaniNeratovice/Handlers/Handler.php
+1
View File
@@ -44,6 +44,7 @@ class Handler extends OnePage
try { try {
Artisan::call('install-module', ['name' => 'StaticPages']); Artisan::call('install-module', ['name' => 'StaticPages']);
Artisan::call('install-module', ['name' => 'ContactForm']); Artisan::call('install-module', ['name' => 'ContactForm']);
Artisan::call('install-module', ['name' => 'Categories']);
} catch (\Exception $e) { } catch (\Exception $e) {
// //
} }