From 6f8e46af290b7a8ea2214ebe405c2bcaa9d92114 Mon Sep 17 00:00:00 2001
From: andryeyev <volodymyr.andryeyev@gmail.com>
Date: Thu, 14 Jan 2016 10:30:20 +0200
Subject: [PATCH] + fix по сливаниям веток

---
 backend/controllers/MenuController.php         | 1 +
 backend/controllers/MenuLocationController.php | 4 ++--
 backend/controllers/TerminController.php       | 1 +
 backend/models/Menu.php                        | 5 +++++
 backend/models/MenuSearch.php                  | 5 +++--
 backend/views/menu/index.php                   | 5 +++--
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/backend/controllers/MenuController.php b/backend/controllers/MenuController.php
index c060821..cfa24a2 100644
--- a/backend/controllers/MenuController.php
+++ b/backend/controllers/MenuController.php
@@ -118,4 +118,5 @@ class MenuController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+
 }
diff --git a/backend/controllers/MenuLocationController.php b/backend/controllers/MenuLocationController.php
index 2e3121a..68fdf69 100644
--- a/backend/controllers/MenuLocationController.php
+++ b/backend/controllers/MenuLocationController.php
@@ -4,7 +4,7 @@ namespace backend\controllers;
 
 use Yii;
 use backend\models\MenuLocation;
-use backend\models\MenuSearchLocation;
+use backend\models\MenuLocationSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
@@ -32,7 +32,7 @@ class MenuLocationController extends Controller
      */
     public function actionIndex()
     {
-        $searchModel = new MenuSearchLocation();
+        $searchModel = new MenuLocationSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
         return $this->render('index', [
diff --git a/backend/controllers/TerminController.php b/backend/controllers/TerminController.php
index 435a5d1..e4774ae 100644
--- a/backend/controllers/TerminController.php
+++ b/backend/controllers/TerminController.php
@@ -10,6 +10,7 @@ use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use backend\models\TerminLang;
 use backend\models\TerminStructure;
+use yii\filters\AccessControl;
 
 /**
  * TerminController implements the CRUD actions for Termin model.
diff --git a/backend/models/Menu.php b/backend/models/Menu.php
index ba22c5f..2877cfd 100644
--- a/backend/models/Menu.php
+++ b/backend/models/Menu.php
@@ -94,4 +94,9 @@ class Menu extends \yii\db\ActiveRecord
             ->all();
  */
     }    
+
+    public function getTerminLang()
+    {
+        return $this->hasOne(TerminLang::className(), ['termin_id' => 'termin_id']);
+    }
 }
diff --git a/backend/models/MenuSearch.php b/backend/models/MenuSearch.php
index bb61ec0..ee6974a 100644
--- a/backend/models/MenuSearch.php
+++ b/backend/models/MenuSearch.php
@@ -49,7 +49,8 @@ class MenuSearch extends Menu
 
         $this->load($params);
 
-        if (!$this->validate()) {
+        if (! $this->validate()) 
+        {
             // uncomment the following line if you do not want to return any records when validation fails
             // $query->where('0=1');
             return $dataProvider;
@@ -67,7 +68,7 @@ class MenuSearch extends Menu
         ]);
 
         $query->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'url', $this->url]);
+              ->andFilterWhere(['like', 'url', $this->url]);
 
         return $dataProvider;
     }
diff --git a/backend/views/menu/index.php b/backend/views/menu/index.php
index 11d81c4..0c63475 100644
--- a/backend/views/menu/index.php
+++ b/backend/views/menu/index.php
@@ -28,8 +28,9 @@ $this->params['breadcrumbs'][] = $this->title;
 
             [
                 'attribute' => Yii::t('app', 'termin'),
-                'value' => function ($model) {
-                    return empty($model->termin_id) ? '-' : $model->termin_lang->termin_title;
+                'value' => function ($model) 
+                { 
+                    return empty ($model->termin_id) ? '-' : $model->terminLang->termin_title;
                 },
             ], 
             'menu_pid',
--
libgit2 0.21.4