FIX: fix few bugs in routes

This commit is contained in:
Michal Kváček
2017-08-11 04:13:33 +02:00
parent ef432702b4
commit 7d847cbab9
9 changed files with 30 additions and 22 deletions
+14 -13
View File
@@ -8,6 +8,7 @@ use App\CMS\Contracts\Widgets\WidgetRenderer;
use App\CMS\Widgets\Exceptions\MissingParameterException;
use App\Http\Requests\Request;
use App\Models\Content\Content;
use Illuminate\Support\Facades\Cache;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
use Modules\Blog\Article\Handlers\Article;
@@ -15,7 +16,6 @@ class Menu implements PublicWidget
{
/**
* Name getter
*
* @return string
*/
public static function getName()
@@ -25,7 +25,6 @@ class Menu implements PublicWidget
/**
* Getter for description
*
* @return string
*/
public static function getDescription()
@@ -35,7 +34,6 @@ class Menu implements PublicWidget
/**
* Getter for presenter/renderer of this widget
*
* @return WidgetRenderer
*/
public static function getPresenter()
@@ -75,16 +73,19 @@ class Menu implements PublicWidget
$allowedStatuses[] = IContent::STATUS_PROTECTED;
}
$pages = Content::where('language', LaravelLocalization::getCurrentLocale())
->whereIn('id', $ids)
->whereIn('status', $allowedStatuses)
->where('moduleHandler', '!=', Article::class)
->get();
$used = [];
foreach ($pages as $page) {
$used[$page->id] = $page;
}
return Cache::remember('widget-menu-content-pages', 5, function () use ($ids, $allowedStatuses) {
$pages = Content::where('language', LaravelLocalization::getCurrentLocale())
->whereIn('id', $ids)
->whereIn('status', $allowedStatuses)
->where('moduleHandler', '!=', Article::class)
->get();
return $used;
$used = [];
foreach ($pages as $page) {
$used[$page->id] = $page;
}
return $used;
});
}
}