From 57e9745b752234054ed4503c1cae299afa0abb7a Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Mon, 25 Jan 2016 13:02:26 +0200
Subject: [PATCH] test

---
 backend/views/termin/index.php                   | 11 +++++++----
 common/config/main-local.php                     |  8 ++++----
 common/config/main.php                           |  2 +-
 common/modules/blog/views/ajax/_article_form.php | 18 +++++++++---------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/backend/views/termin/index.php b/backend/views/termin/index.php
index da09968..bfb21db 100644
--- a/backend/views/termin/index.php
+++ b/backend/views/termin/index.php
@@ -1,6 +1,6 @@
 <?php
-
-use yii\helpers\Html;
+    use backend\models\Termin;
+    use yii\helpers\Html;
 use yii\grid\GridView;
 
 /* @var $this yii\web\View */
@@ -32,8 +32,11 @@ $this->params['breadcrumbs'][] = $this->title;
                 'attribute' => 'termin_parent_title',
                 'value' => 'terminStructures.parent.terminLangs.termin_title',
                 'content' => function($model, $key, $index, $column) {
-                    var_dump($model);
-                    return 1; //$model->terminStructures[0]->parent->terminLangs[0]->termin_title;
+                    if($model->terminStructures[0]->parent instanceof Termin) {
+                        return $model->terminStructures[0]->parent->terminLangs[0]->termin_title;
+                    } else {
+                        return NULL;
+                    }
                 }
             ],
             'termin_name',
diff --git a/common/config/main-local.php b/common/config/main-local.php
index acde56c..f47e800 100644
--- a/common/config/main-local.php
+++ b/common/config/main-local.php
@@ -7,10 +7,10 @@ return [
             'username' => 'test33',
             'password' => 'E4q2N7i9',
             'schemaMap' => [
-            'pgsql'=> [
-             'class'=>'yii\db\pgsql\Schema',
-             'defaultSchema' => 'public'
-             ]
+                'pgsql'=> [
+                    'class'=>'yii\db\pgsql\Schema',
+                    'defaultSchema' => 'public'
+                ]
             ],
         ],
         'mailer' => [
diff --git a/common/config/main.php b/common/config/main.php
index fa05698..9165a96 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -26,7 +26,7 @@ return [
             'rules'=>[
                 '<module:\w+>/<controller:\w+>/<action:(\w|-)+>' => '<module>/<controller>/<action>',
                 '<module:\w+>/<controller:\w+>/<action:(\w|-)+>/<id:\d+>' => '<module>/<controller>/<action>',
-            ]
+            ],
         ],
         'request' => [
             'class' => 'common\components\LangRequest'
diff --git a/common/modules/blog/views/ajax/_article_form.php b/common/modules/blog/views/ajax/_article_form.php
index 47e23d4..782fba1 100644
--- a/common/modules/blog/views/ajax/_article_form.php
+++ b/common/modules/blog/views/ajax/_article_form.php
@@ -10,29 +10,29 @@ if(empty($form)) {
 ?>
 <div role="" class="tab-pane active ajax-loaded" id="<?=$widget_id?>-<?=$model->language_id?>">
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]language_id", 'form' => $form]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
 
     <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
 
     <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]preview", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]seo_url"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]seo_url", 'form' => $form]))->textInput() ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]name"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]name", 'form' => $form]))->textInput() ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_title"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_title", 'form' => $form]))->textInput() ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_descr", 'form' => $form]))->textarea() ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_keyword"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_keyword", 'form' => $form]))->textInput() ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]h1_tag", 'form' => $form]))->textInput() ?>
 
-    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]tag"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]tag", 'form' => $form]))->textInput() ?>
 
 </div>
 <?php
-    if($new_form) {
+    if(isset($new_form) && $new_form === true) {
         $form->end();
     }
 ?>
--
libgit2 0.21.4