diff --git a/backend/models/Menu.php b/backend/models/Menu.php index 2877cfd..e2bb8c1 100644 --- a/backend/models/Menu.php +++ b/backend/models/Menu.php @@ -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() diff --git a/backend/models/MenuSearch.php b/backend/models/MenuSearch.php index ee6974a..6efaa39 100644 --- a/backend/models/MenuSearch.php +++ b/backend/models/MenuSearch.php @@ -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]) diff --git a/backend/models/TerminSearch.php b/backend/models/TerminSearch.php index ef5efe4..71f46d3 100644 --- a/backend/models/TerminSearch.php +++ b/backend/models/TerminSearch.php @@ -12,6 +12,8 @@ use backend\models\Termin; */ class TerminSearch extends Termin { + var $termin_parent_title; + /** * @inheritdoc */ diff --git a/backend/models/TerminStructure.php b/backend/models/TerminStructure.php index 87f5d93..2612eda 100644 --- a/backend/models/TerminStructure.php +++ b/backend/models/TerminStructure.php @@ -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 diff --git a/backend/views/menu/_form.php b/backend/views/menu/_form.php index a629ae2..43b9686 100644 --- a/backend/views/menu/_form.php +++ b/backend/views/menu/_form.php @@ -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]) ?> diff --git a/backend/views/menu/_search.php b/backend/views/menu/_search.php index c37685a..7dd531e 100644 --- a/backend/views/menu/_search.php +++ b/backend/views/menu/_search.php @@ -23,7 +23,7 @@ use yii\widgets\ActiveForm; = $form->field($model, 'termin_id') ?> - = $form->field($model, 'show') ?> + = $form->field($model, 'status') ?> field($model, 'is_open') ?> diff --git a/backend/views/menu/index.php b/backend/views/menu/index.php index 2496513..2be0f94 100644 --- a/backend/views/menu/index.php +++ b/backend/views/menu/index.php @@ -35,8 +35,7 @@ $this->params['breadcrumbs'][] = $this->title; ], */ 'menu_pid', - 'level', - // 'sortorder', + 'level', ['class' => 'yii\grid\ActionColumn'], ], diff --git a/backend/views/menu/view.php b/backend/views/menu/view.php index 1cff6d1..4033dcb 100644 --- a/backend/views/menu/view.php +++ b/backend/views/menu/view.php @@ -32,10 +32,10 @@ $this->params['breadcrumbs'][] = $this->title; 'menu_pid', 'level', 'termin_id', - 'show', + 'status', 'is_open', 'menu_location_id', - 'sortorder', + 'sort', 'name', 'url:url', ], diff --git a/backend/views/termin/_form.php b/backend/views/termin/_form.php index 7a5ad07..1863c91 100644 --- a/backend/views/termin/_form.php +++ b/backend/views/termin/_form.php @@ -9,17 +9,17 @@ use yii\helpers\ArrayHelper; /* @var $this yii\web\View */ /* @var $model backend\models\Termin */ /* @var $form yii\widgets\ActiveForm */ - + ?>
= Html::a(Yii::t('app', 'Create'), ['create'], ['class' => 'btn btn-success']) ?> -
+ - = GridView::widget([ 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, @@ -27,11 +26,14 @@ $this->params['breadcrumbs'][] = $this->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', diff --git a/db-migration/andryeyev/all.backup b/db-migration/andryeyev/all.backup index 79d36a6..dc753e9 100644 Binary files a/db-migration/andryeyev/all.backup and b/db-migration/andryeyev/all.backup differ diff --git a/db-migration/andryeyev/menu.backup b/db-migration/andryeyev/menu.backup index c240353..6069452 100644 Binary files a/db-migration/andryeyev/menu.backup and b/db-migration/andryeyev/menu.backup differ diff --git a/db-migration/andryeyev/termin.backup b/db-migration/andryeyev/termin.backup index 1defb39..d81612b 100644 Binary files a/db-migration/andryeyev/termin.backup and b/db-migration/andryeyev/termin.backup differ diff --git a/db-migration/artbox/artbox_db.backup b/db-migration/artbox/artbox_db.backup index 582d9d0..00767f3 100644 Binary files a/db-migration/artbox/artbox_db.backup and b/db-migration/artbox/artbox_db.backup differ -- libgit2 0.21.4