diff --git a/backend/config/main.php b/backend/config/main.php index 34f2ad1..9f9bcc8 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -172,7 +172,17 @@ return [ 'seo-dynamic///' => 'seo-dynamic/', 'seo-dynamic//' => 'seo-dynamic/', ] - ] + ], + 'urlManagerFrontend' => [ + 'baseUrl' => '/', + 'enablePrettyUrl' => true, + 'showScriptName' => false, + 'class'=>'common\modules\language\components\LanguageUrlManager', + 'rules' => [ + '/' => 'site/index', + '/'=>'/', + ], + ], ], 'params' => $params, diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php index dad2406..e78fa6c 100644 --- a/backend/controllers/SliderController.php +++ b/backend/controllers/SliderController.php @@ -6,6 +6,7 @@ use common\models\TemplateLocation; use Yii; use common\models\Slider; use common\models\SliderSearch; +use yii\db\ActiveQuery; use yii\helpers\ArrayHelper; use yii\web\Controller; use yii\web\NotFoundHttpException; @@ -51,6 +52,11 @@ class SliderController extends Controller { $searchModel = new SliderSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + /** + * @var ActiveQuery $query + */ + $query = $dataProvider->query; + $query->with('sliderImage'); return $this->render('index', [ 'searchModel' => $searchModel, @@ -59,18 +65,6 @@ class SliderController extends Controller } /** - * Displays a single Slider model. - * @param integer $id - * @return mixed - */ - public function actionView($id) - { - return $this->render('view', [ - 'model' => $this->findModel($id), - ]); - } - - /** * Creates a new Slider model. * If creation is successful, the browser will be redirected to the 'view' page. * @return mixed diff --git a/backend/controllers/SliderImageController.php b/backend/controllers/SliderImageController.php index 6a792c8..6698a49 100644 --- a/backend/controllers/SliderImageController.php +++ b/backend/controllers/SliderImageController.php @@ -96,20 +96,13 @@ if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); $model->slider_id = $slider_id; - if($model->save()) { - if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { - return $this->redirect([ - 'view', - 'slider_id' => $slider_id, - 'id' => $model->slider_image_id, - ]); - } else { - return $this->redirect([ - 'update', - 'slider_id' => $slider_id, - 'id' => $model->slider_image_id, - ]); - } + $model->model_langs = $model_langs; + if($model->save() && $model->transactionStatus) { + return $this->redirect([ + 'view', + 'slider_id' => $slider_id, + 'id' => $model->slider_image_id, + ]); } } $slider = Slider::findOne($slider_id); @@ -136,7 +129,8 @@ $model_langs = $model->generateLangs(); if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); - if($model->save() && $model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { + $model->model_langs = $model_langs; + if($model->save() && $model->transactionStatus) { return $this->redirect([ 'view', 'slider_id' => $slider_id, diff --git a/backend/views/banner/index.php b/backend/views/banner/index.php index b9648c6..424a0ea 100644 --- a/backend/views/banner/index.php +++ b/backend/views/banner/index.php @@ -1,19 +1,20 @@ title = Yii::t('app', 'Banners'); $this->params[ 'breadcrumbs' ][] = $this->title; ?>