Admin begin refactor.

Yarik
1 parent 93c267f7
Showing 8 changed files with 257 additions and 115 deletions Show diff stats
backend/controllers/ArticlesController.php
backend/views/articles/index.php
backend/views/articles/view.php
backend/web/css/site.css
common/models/Articles.php
common/models/ArticlesSearch.php
common/modules/language/behaviors/TransactionBehavior.php
common/modules/language/readme.txt
@@ -9,7 +9,6 @@
     use yii\web\NotFoundHttpException;
     use yii\filters\VerbFilter;
     use developeruz\db_rbac\behaviors\AccessBehavior;
-    use yii\web\UploadedFile;
  
     /**
      * ArticlesController implements the CRUD actions for Articles model.
@@ -86,18 +85,12 @@
             $model_langs = $model->generateLangs();
             if($model->load(Yii::$app->request->post())) {
                 $model->loadLangs(\Yii::$app->request, $model_langs);
-                if($model->save()) {
-                    if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) {
-                        return $this->redirect([
-                            'view',
-                            'id' => $model->id,
-                        ]);
-                    } else {
-                        return $this->redirect([
-                            'update',
-                            'id' => $model->id,
-                        ]);
-                    }
+                $model->model_langs = $model_langs;
+                if($model->save() && $model->transactionStatus) {
+                    return $this->redirect([
+                        'view',
+                        'id' => $model->id,
+                    ]);
                 }
             }
             return $this->render('create', [
@@ -120,13 +113,12 @@
             $model_langs = $model->generateLangs();
             if($model->load(Yii::$app->request->post())) {
                 $model->loadLangs(\Yii::$app->request, $model_langs);
-                if($model->save()) {
-                    if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) {
-                        return $this->redirect([
-                            'view',
-                            'id' => $model->id,
-                        ]);
-                    }
+                $model->model_langs = $model_langs;
+                if($model->save() && $model->transactionStatus) {
+                    return $this->redirect([
+                        'view',
+                        'id' => $model->id,
+                    ]);
                 }
             }
             return $this->render('update', [
@@ -162,7 +154,11 @@
          */
         protected function findModel($id)
         {
-            if(( $model = Articles::findOne($id) ) !== NULL) {
+            if(( $model = Articles::find()
+                                  ->where([ 'id' => $id ])
+                                  ->with('lang')
+                                  ->one() ) !== NULL
+            ) {
                 return $model;
             } else {
                 throw new NotFoundHttpException('The requested page does not exist.');
 <?php
-
-use yii\helpers\Html;
-use yii\grid\GridView;
-
-/* @var $this yii\web\View */
-/* @var $searchModel common\models\ArticlesSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = \Yii::t('app', 'Articles');
-$this->params['breadcrumbs'][] = $this->title;
+    
+    use yii\helpers\Html;
+    use yii\grid\GridView;
+    
+    /**
+     * @var yii\web\View                 $this
+     * @var common\models\ArticlesSearch $searchModel
+     * @var yii\data\ActiveDataProvider  $dataProvider
+     */
+    
+    $this->title = \Yii::t('app', 'Articles');
+    $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="articles-index">
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a(\Yii::t('app', 'Create Articles'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(\Yii::t('app', 'Create Articles'), [ 'create' ], [ 'class' => 'btn btn-success' ]) ?>
     </p>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
+        'filterModel'  => $searchModel,
+        'columns'      => [
             'id',
-            'date',
+            [
+                'attribute' => 'title',
+                'value'     => 'lang.title',
+            ],
+            'date:date',
             'imageUrl:image',
-            ['class' => 'yii\grid\ActionColumn'],
+            [ 'class' => 'yii\grid\ActionColumn' ],
         ],
     ]); ?>
 </div>
 <?php
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-
-/* @var $this yii\web\View */
-/* @var $model common\models\Articles */
-
-$this->title = $model->id;
-$this->params['breadcrumbs'][] = ['label' => \Yii::t('app', 'Articles'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
+    
+    use yii\helpers\Html;
+    use yii\widgets\DetailView;
+    
+    /**
+     * @var yii\web\View           $this
+     * @var common\models\Articles $model
+     */
+    
+    $this->title = $model->lang->title;
+    $this->params[ 'breadcrumbs' ][] = [
+        'label' => \Yii::t('app', 'Articles'),
+        'url'   => [ 'index' ],
+    ];
+    $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="articles-view">
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a(\Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(\Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
+        <?= Html::a(\Yii::t('app', 'Update'), [
+            'update',
+            'id' => $model->id,
+        ], [ 'class' => 'btn btn-primary' ]) ?>
+        <?= Html::a(\Yii::t('app', 'Delete'), [
+            'delete',
+            'id' => $model->id,
+        ], [
             'class' => 'btn btn-danger',
-            'data' => [
+            'data'  => [
                 'confirm' => \Yii::t('app', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
+                'method'  => 'post',
             ],
         ]) ?>
     </p>
     <?= DetailView::widget([
-        'model' => $model,
+        'model'      => $model,
         'attributes' => [
             'id',
-            'date',
+            'date:date',
+            'lang.title',
+            'lang.body:html',
+            'imageUrl:image',
         ],
     ]) ?>
 </div>
@@ -207,3 +207,9 @@ a.desc:after {
     text-align: center;
     font-size: 13px !important;
 }
+.grid-view td img {
+    max-width: 250px;
+}
+.detail-view td img {
+    max-width: 100%;
+}
 \ No newline at end of file
 <?php
  
     namespace common\models;
-    
+
+    use common\modules\language\behaviors\TransactionBehavior;
     use common\modules\language\behaviors\LanguageBehavior;
     use common\behaviors\SaveImgBehavior;
     use common\modules\comment\models\CommentModel;
@@ -32,6 +33,11 @@
      * @method bool             linkLangs(ActiveRecord[] $model_langs)
      * @method bool             saveLangs(ActiveRecord[] $model_langs)
      * * End language behavior *
+     * * From transaction behavior *
+     * @property ArticlesLang[]  $model_langs
+     * @property bool           $transactionStatus
+     * @method bool             getTransactionStatus()
+     * * End transaction behavior *
      */
     class Articles extends \yii\db\ActiveRecord
     {
@@ -63,6 +69,9 @@
                 'language' => [
                     'class' => LanguageBehavior::className(),
                 ],
+                'transaction' => [
+                    'class' => TransactionBehavior::className(),
+                ],
             ];
         }
  
 <?php
-
-namespace common\models;
-
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-
-/**
- * ArticlesSearch represents the model behind the search form about `common\models\Articles`.
- */
-class ArticlesSearch extends Articles
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['id'], 'integer'],
-        ];
-    }
  
-    public function behaviors()
-    {
-        return [];
-    }
+    namespace common\models;
  
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
+    use yii\base\Model;
+    use yii\data\ActiveDataProvider;
+    use yii\data\Sort;
  
     /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
+     * ArticlesSearch represents the model behind the search form about `common\models\Articles`.
      */
-    public function search($params)
+    class ArticlesSearch extends Articles
     {
-        $query = Articles::find();
-
-        // add conditions that should always apply here
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
+        
+        public $title;
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [ 'id' ],
+                    'integer',
+                ],
+                [
+                    [ 'title' ],
+                    'string',
+                ],
+            ];
+        }
+        
+        public function behaviors()
+        {
+            return [];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function scenarios()
+        {
+            // bypass scenarios() implementation in the parent class
+            return Model::scenarios();
+        }
+        
+        /**
+         * Creates data provider instance with search query applied
+         *
+         * @param array $params
+         *
+         * @return ActiveDataProvider
+         */
+        public function search($params)
+        {
+            $query = Articles::find()
+                             ->joinWith('lang');
+            
+            // add conditions that should always apply here
+            
+            $dataProvider = new ActiveDataProvider([
+                'query' => $query,
+                'sort'  => [
+                    'attributes' => [
+                        'id',
+                        'title' => [
+                            'asc'  => [ 'articles_lang.title' => SORT_ASC ],
+                            'desc' => [ 'articles_lang.title' => SORT_DESC ],
+                        ],
+                    ],
+                ],
+            ]);
+            
+            $this->load($params);
+            
+            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;
+            }
+            
+            // grid filtering conditions
+            $query->andFilterWhere([
+                'id' => $this->id,
+            ]);
+            
+            $query->andFilterWhere([
+                'like',
+                'articles_lang.title',
+                $this->title,
+            ]);
+            
             return $dataProvider;
         }
-
-        // grid filtering conditions
-        $query->andFilterWhere([
-            'id' => $this->id,
-        ]);
-
-        return $dataProvider;
     }
-}
+<?php
+    
+    namespace common\modules\language\behaviors;
+    
+    use yii\base\Behavior;
+    use yii\db\ActiveRecord;
+    use yii\db\Transaction;
+
+    /**
+     * Class Save Image Behavior
+     * @property ActiveRecord $owner
+     * @package common\behaviors
+     */
+    class TransactionBehavior extends Behavior
+    {
+    
+        /**
+         * @var Transaction $_transaction
+         */
+        private $_transaction;
+    
+        /**
+         * @var bool $_transaction_status
+         */
+        private $_transaction_status = false;
+    
+        /**
+         * @var ActiveRecord[] $model_langs
+         */
+        public $model_langs = [];
+        
+        public function events()
+        {
+            return [
+                ActiveRecord::EVENT_BEFORE_INSERT => 'beforeSave',
+                ActiveRecord::EVENT_BEFORE_UPDATE => 'beforeSave',
+                ActiveRecord::EVENT_AFTER_INSERT => 'afterSave',
+                ActiveRecord::EVENT_AFTER_UPDATE => 'afterSave',
+            ];
+        }
+        
+        public function beforeSave($event) {
+            /**
+             * @var ActiveRecord $owner
+             */
+            $owner = $this->owner;
+            $db = $owner::getDb();
+            $this->_transaction = $db->beginTransaction();
+        }
+        
+        public function afterSave($event) {
+            /**
+             * @var ActiveRecord $owner
+             */
+            $owner = $this->owner;
+            if(!empty($this->model_langs) && $owner->getBehavior('language')) {
+                if($owner->linkLangs($this->model_langs) && $owner->saveLangs($this->model_langs)) {
+                    $this->_transaction->commit();
+                    $this->_transaction_status = true;
+                } else {
+                    $this->_transaction->rollBack();
+                    $this->_transaction_status = false;
+                }
+            } else {
+                $this->_transaction->commit();
+                $this->_transaction_status = true;
+            }
+        }
+    
+        /**
+         * @return bool
+         */
+        public function getTransactionStatus():bool {
+            return $this->_transaction_status;
+        }
+        
+    }
 \ No newline at end of file
@@ -45,6 +45,9 @@ public function behaviors() {
             'ownerKey' => {Table}->id //optional, default to {Table}->primaryKey()[0]
             'langKey' => {TableLang}->table_id //optional, default to {Table}->tableName().'_id'
         ],
+        'transaction' => [
+            'class' => TransactionBehavior::className(),
+        ],
     ];
 }
 3.1. PHPDoc для {Table}:
@@ -65,6 +68,11 @@ public function behaviors() {
      * @method bool             linkLangs(ActiveRecord[] $model_langs)
      * @method bool             saveLangs(ActiveRecord[] $model_langs)
      * * End language behavior *
+     * * From transaction behavior *
+     * @property {TableLang}[]  $model_langs
+     * @property bool           $transactionStatus
+     * @method bool             getTransactionStatus()
+     * * End transaction behavior *
 3.2. Убрать language behavior с наследуемых таблиц от {Table} ({TableSearch}...)
 4. Доступные полезные методы:
     {Table}->getLangs() - получить все текущие {TableLang} для {Table} проиндексированные по language_id
@@ -83,6 +91,6 @@ public function behaviors() {
 6. Обрабатывать данные в контроллере.
     1. После создания/поиска {Table} создаем/находим языковые модели {Table}->generateLangs()
     2. При POST запросе загружаем данные в языковые модели {Table}->loadLangs(Request $request, {TableLangs[]} $model_langs)
-    3. Связываем модель {Table} с языковыми моделями {Table}->linkLangs({TableLang[]} $model_langs). Возвращает true при успехе.
-    4. Сохраняе языковые модели в базу {Table}->saveLangs({TableLang[]} $model_langs). Возвращает true при успешной валидации каждого {TableLang}.
+    3. Передаем в свойство model_langs модели {Table} массив {TableLang[]}: $model->model_langs = $model_langs
+    4. После сохранения, если транзанкция успешна, то свойство {Table}->transactionStatus будет true, иначе возникла ошибка в какой то модели.
 7. Получать данные на публичной части сайта через {Table}->lang.
 \ No newline at end of file