diff --git a/frontend/controllers/PageController.php b/frontend/controllers/PageController.php index 9d15262..3a4bd88 100755 --- a/frontend/controllers/PageController.php +++ b/frontend/controllers/PageController.php @@ -3,6 +3,8 @@ use artbox\core\components\SeoComponent; use artbox\core\models\Page; + use artbox\core\models\PageCategory; + use yii\db\ActiveQuery; use yii\web\Controller; use yii\web\NotFoundHttpException; use Yii; @@ -33,25 +35,33 @@ $lefts = null; } - $pages = Page::find() - ->with('lang') - ->where( - [ - 'not', - [ 'id' => $id ], - ] - ) - ->limit(5) - ->all(); + $categories = PageCategory::find() + ->with('lang') + ->with( + [ + 'pages' => function (ActiveQuery $query) use ($id) { + $query->with('lang.alias'); + $query->where( + [ + 'not', + [ + 'id' => $id, + ], + ] + ); + }, + ] + ) + ->all(); return $this->render( 'view', [ - 'model' => $model, - 'pages' => $pages, - 'body' => $body, - 'lefts' => $lefts, - 'images' => $model->getImages(), + 'model' => $model, + 'categories' => $categories, + 'body' => $body, + 'lefts' => $lefts, + 'images' => $model->getImages(), ] ); } diff --git a/frontend/views/page/view.php b/frontend/views/page/view.php index 001a761..e77eb90 100755 --- a/frontend/views/page/view.php +++ b/frontend/views/page/view.php @@ -2,17 +2,18 @@ use artbox\core\components\SeoComponent; use artbox\core\models\Image; use artbox\core\models\Page; + use artbox\core\models\PageCategory; use yii\helpers\Html; use yii\web\View; /** - * @var View $this - * @var Page $model - * @var Page[] $pages - * @var SeoComponent $seo - * @var Image[] $images - * @var string $lefts - * @var string $body + * @var View $this + * @var Page $model + * @var PageCategory[] $categories + * @var SeoComponent $seo + * @var Image[] $images + * @var string $lefts + * @var string $body */ $seo = \Yii::$app->get('seo'); $this->params[ 'breadcrumbs' ][] = $seo->title; @@ -69,30 +70,36 @@ _________________________________________________________ --> @@ -121,9 +128,9 @@ _________________________________________________________ -->
-
- +
\ No newline at end of file -- libgit2 0.21.4