REFACTORING: another ugly commit full of refactored code
This commit is contained in:
@@ -3,6 +3,7 @@ namespace Templates\Base\OnePage\Handlers;
|
||||
|
||||
use App\CMS\Contracts\Modules\InstallableModule;
|
||||
use App\CMS\Contracts\Modules\TemplateHandler;
|
||||
use App\CMS\Contracts\Repositories\Content as IContent;
|
||||
use App\CMS\Helpers\CurrentTemplate;
|
||||
use App\CMS\Helpers\PageRenderer;
|
||||
use App\CMS\Helpers\Settings;
|
||||
@@ -60,17 +61,18 @@ abstract class OnePage implements TemplateHandler, InstallableModule
|
||||
$pages = Content::whereIn('id', $pageIds);
|
||||
|
||||
if (Auth::user()) {
|
||||
$pages = $pages->where('status', '!=', Content::STATUS_DRAFT);
|
||||
$pages = $pages->where('status', '!=', IContent::STATUS_DRAFT);
|
||||
} else {
|
||||
$pages = $pages->where('status', Content::STATUS_PUBLIC);
|
||||
$pages = $pages->where('status', IContent::STATUS_PUBLIC);
|
||||
}
|
||||
|
||||
$homepagePages = $pages->get()
|
||||
->getDictionary();
|
||||
->getDictionary();
|
||||
|
||||
foreach ($pageIds as $pageId) {
|
||||
if (!isset($homepagePages[$pageId]))
|
||||
if (!isset($homepagePages[$pageId])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
self::$homepagePages[] = $homepagePages[$pageId];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user