From 9fdba9c2ce360a29fa1d4029d6ec30fbf14f073d Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 15 Feb 2016 12:09:08 +0200 Subject: [PATCH] 15.02.16 --- frontend/controllers/AccountsController.php | 24 +++++------------------- frontend/views/accounts/_portfolio_form.php | 30 +++++++++++++++++++++++++++--- frontend/views/performer/gallery.php | 17 ++++++++++++++++- 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/frontend/controllers/AccountsController.php b/frontend/controllers/AccountsController.php index 918c0db..756dd75 100755 --- a/frontend/controllers/AccountsController.php +++ b/frontend/controllers/AccountsController.php @@ -355,7 +355,7 @@ { $searchModel = new PortfolioSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); - + $dataProvider->pagination->pageSize=5; return $this->render('portfolio', [ 'searchModel' => $searchModel, 'dataProvider' => $dataProvider, @@ -365,14 +365,7 @@ public function actionPortfolioCreate() { $portfolio = new Portfolio(); - $specialization = Specialization::find() - ->select([ - 'specialization_name', - 'specialization_id', - ]) - ->indexBy('specialization_id') - ->asArray() - ->column(); + $specializations = Specialization::find()->orderBy('specialization_id')->all(); $post = \Yii::$app->request->post(); if(!empty( $post )) { $portfolio->load($post); @@ -388,21 +381,14 @@ } return $this->render('_portfolio_form', [ 'portfolio' => $portfolio, - 'specialization' => $specialization, + 'specializations' => $specializations, ]); } public function actionPortfolioUpdate($id) { $portfolio = Portfolio::findOne($id); - $specialization = Specialization::find() - ->select([ - 'specialization_name', - 'specialization_id', - ]) - ->indexBy('specialization_id') - ->asArray() - ->column(); + $specializations = Specialization::find()->orderBy('specialization_id')->all(); $post = \Yii::$app->request->post(); if(!empty( $post )) { $portfolio->load($post); @@ -418,7 +404,7 @@ } return $this->render('_portfolio_form', [ 'portfolio' => $portfolio, - 'specialization' => $specialization, + 'specializations' => $specializations, ]); } diff --git a/frontend/views/accounts/_portfolio_form.php b/frontend/views/accounts/_portfolio_form.php index ed2f602..7e76759 100644 --- a/frontend/views/accounts/_portfolio_form.php +++ b/frontend/views/accounts/_portfolio_form.php @@ -4,7 +4,8 @@ */ use common\models\Option; use common\models\Portfolio; - use common\widgets\ImageUploader; +use common\models\Specialization; +use common\widgets\ImageUploader; use mihaildev\ckeditor\CKEditor; use yii\helpers\Html; use yii\widgets\ActiveForm; @@ -42,8 +43,31 @@ use yii\web\JsExpression;
- field($portfolio, 'specializationInput') - ->checkboxList($specialization) ?> +
diff --git a/frontend/views/performer/gallery.php b/frontend/views/performer/gallery.php index 3b9b71d..cce103c 100755 --- a/frontend/views/performer/gallery.php +++ b/frontend/views/performer/gallery.php @@ -54,4 +54,19 @@ $this->title = 'My Yii Application'; ?> - \ No newline at end of file + + \ No newline at end of file -- libgit2 0.21.4