+ fix по багам после сливаний

andryeyev
1 parent 8ab26639
Showing 14 changed files with 30 additions and 22 deletions Show diff stats
backend/models/Menu.php
backend/models/MenuSearch.php
backend/models/TerminSearch.php
backend/models/TerminStructure.php
backend/views/menu/_form.php
backend/views/menu/_search.php
backend/views/menu/index.php
backend/views/menu/view.php
backend/views/termin/_form.php
backend/views/termin/index.php
db-migration/andryeyev/all.backup
db-migration/andryeyev/menu.backup
db-migration/andryeyev/termin.backup
db-migration/artbox/artbox_db.backup
@@ -36,8 +36,8 @@ class Menu extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['menu_id', 'menu_pid', 'level', 'termin_id', 'show', 'is_open', 'menu_location_id', 'sortorder'], 'required'],
-            [['menu_id', 'menu_pid', 'level', 'termin_id', 'show', 'is_open', 'menu_location_id', 'sortorder'], 'integer'],
+            [['menu_id', 'menu_pid', 'level', 'termin_id', 'status', 'is_open', 'menu_location_id', 'sort'], 'required'],
+            [['menu_id', 'menu_pid', 'level', 'termin_id', 'status', 'is_open', 'menu_location_id', 'sort'], 'integer'],
             [['name', 'url'], 'string', 'max' => 250]
         ];
     }
@@ -52,10 +52,10 @@ class Menu extends \yii\db\ActiveRecord
             'menu_pid' => Yii::t('app', 'Menu Pid'),
             'level' => Yii::t('app', 'Level'),
             'termin_id' => Yii::t('app', 'Termin ID'),
-            'show' => Yii::t('app', 'Show'),
+            'status' => Yii::t('app', 'Show'),
             'is_open' => Yii::t('app', 'Is Open'),
             'menu_location_id' => Yii::t('app', 'Menu Location ID'),
-            'sortorder' => Yii::t('app', 'Sortorder'),
+            'sort' => Yii::t('app', 'Sortorder'),
             'name' => Yii::t('app', 'Name'),
             'url' => Yii::t('app', 'Url'),
         ];
@@ -81,7 +81,7 @@ class Menu extends \yii\db\ActiveRecord
                 INNER JOIN termin ON termin.termin_id = menu.termin_id
                 INNER JOIN termin_lang ON termin_lang.termin_id = menu.termin_id
                     AND termin_lang.language_id = '.Yii::$app->params['language_id'].'
-            ORDER BY menu.level ASC, menu.sortorder ASC
+            ORDER BY menu.level ASC, menu.sort ASC
         ')->queryAll();
 /*
          return $this->find()
@@ -18,7 +18,7 @@ class MenuSearch extends Menu
     public function rules()
     {
         return [
-            [['menu_id', 'menu_pid', 'level', 'termin_id', 'show', 'is_open', 'menu_location_id', 'sortorder'], 'integer'],
+            [['menu_id', 'menu_pid', 'level', 'termin_id', 'status', 'is_open', 'menu_location_id', 'sort'], 'integer'],
             [['name', 'url'], 'safe'],
         ];
     }
@@ -61,10 +61,10 @@ class MenuSearch extends Menu
             'menu_pid' => $this->menu_pid,
             'level' => $this->level,
             'termin_id' => $this->termin_id,
-            'show' => $this->show,
+            'status' => $this->status,
             'is_open' => $this->is_open,
             'menu_location_id' => $this->menu_location_id,
-            'sortorder' => $this->sortorder,
+            'sort' => $this->sort,
         ]);
  
         $query->andFilterWhere(['like', 'name', $this->name])
@@ -12,6 +12,8 @@ use backend\models\Termin;
  */
 class TerminSearch extends Termin
 {
+    var $termin_parent_title;
+    
     /**
      * @inheritdoc
      */
@@ -51,6 +51,11 @@ class TerminStructure extends \yii\db\ActiveRecord
     {
         return $this->hasOne(Termin::className(), ['termin_id' => 'termin_id']);
     }
+    
+    public function getParent()
+    {
+        return $this->hasOne(Termin::className(), ['termin_id' => 'termin_pid']);
+    }
  
     /**
      * @return \yii\db\ActiveQuery
@@ -20,13 +20,13 @@ use yii\widgets\ActiveForm;
  
     <?= $form->field($model, 'termin_id')->textInput() ?>
  
-    <?= $form->field($model, 'show')->textInput() ?>
+    <?= $form->field($model, 'status')->textInput() ?>
  
     <?= $form->field($model, 'is_open')->textInput() ?>
  
     <?= $form->field($model, 'menu_location_id')->textInput() ?>
  
-    <?= $form->field($model, 'sortorder')->textInput() ?>
+    <?= $form->field($model, 'sort')->textInput() ?>
  
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
  
@@ -23,7 +23,7 @@ use yii\widgets\ActiveForm;
  
     <?= $form->field($model, 'termin_id') ?>
  
-    <?= $form->field($model, 'show') ?>
+    <?= $form->field($model, 'status') ?>
  
     <?php // echo $form->field($model, 'is_open') ?>
  
@@ -35,8 +35,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             ],
             */
             'menu_pid',
-            'level',
-            // 'sortorder',
+            'level', 
  
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -32,10 +32,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'menu_pid',
             'level',
             'termin_id',
-            'show',
+            'status',
             'is_open',
             'menu_location_id',
-            'sortorder',
+            'sort',
             'name',
             'url:url',
         ],
@@ -9,17 +9,17 @@ use yii\helpers\ArrayHelper;
 /* @var $this yii\web\View */
 /* @var $model backend\models\Termin */
 /* @var $form yii\widgets\ActiveForm */
-
+ 
 ?>
  
 <div class="termin-form">
  
     <?php $form = ActiveForm::begin(); ?>
  
-	<?= $form->field($model_pid->termin, 'termin_pid')->widget(Select2::classname(), 
+	<?= $form->field($model_pid->termin, 'termin_id')->widget(Select2::classname(), 
         [
             'data' => ArrayHelper::map((new Termin)->finInfo([  
-                    'show_all' => true, 
+                    'show_all' => true,  
             	]),
 	           'termin_id',
 	           'termin_title'
@@ -17,9 +17,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
  
     <p>
         <?= Html::a(Yii::t('app', 'Create'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
+    </p> 
  
-	
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
@@ -27,11 +26,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             ['class' => 'yii\grid\SerialColumn'],
             [
                 'attribute' => 'termin_title',
-                'value' => 'terminLangs.termin_title'
+                //'value' => 'terminLangs.termin_title'
             ],
             [
                 'attribute' => 'termin_parent_title',
-                'value' => 'parent.terminLangs.termin_title'
+                'value' => 'terminStructures.parent.terminLangs.termin_title',
+                'content' => function($model, $key, $index, $column) {
+                    return $model->terminStructures[0]->parent->terminLangs[0]->termin_title;
+                }
             ],
             'termin_name',
             'is_book',