fix reviews

common/modules/reviews/controllers/ReviewAdminController.php

@@ -110,19 +110,8 @@ class ReviewAdminController extends AdminController
             'Добавить отзыв'
         ];
 
-        $model->load(Yii::$app->request->post());
-        $model->image = UploadedFile::getInstance($model, 'image');
-
-        if (Yii::$app->request->isPost && $model->validate()) 
+        if ($model->load(Yii::$app->request->post()) && $model->save()) 
         {
-            if($model->image)
-            {
-                $model->upload();
-                $model->image = null;
-            }
-                
-            $model->save();
-
             return $this->redirect(['manage']);
         } 
         else 
@@ -152,25 +141,8 @@ class ReviewAdminController extends AdminController
             'Редактировать отзыв'
         ];
 
-        $model->load(Yii::$app->request->post());
-        $model->image = UploadedFile::getInstance($model, 'image');
-
-        if (Yii::$app->request->isPost && $model->validate()) 
+        if ($model->load(Yii::$app->request->post()) && $model->save()) 
         {
-            if($model->photo || $model->photo_delete)
-            {
-                $model->deletePhoto();
-                $model->photo = null;
-            }
-
-            if($model->image)
-            {
-                $model->upload();
-                $model->image = null;
-            }
-                
-            $model->save();
-
             return $this->redirect(['manage']);
         } 
         else 

common/modules/reviews/forms/ReviewForm.php

@@ -14,9 +14,9 @@ return [
         'title'              => [
             'type' => 'text',
         ],
-        ($model->photo?Html::img(\Yii::$app->params['frontUrl'] . Reviews::PHOTO_FOLDER . $model->photo):''),
-        'photo_delete'       => ['type' => 'checkbox', 'class' => 'form-control',],
-        'image'              => ['type' => 'file', 'class' => 'form-control',],
+        ($model->photo?Html::img(\Yii::$app->params['frontUrl'] . $model->photo):''),
+        'unlinkFile'       => ['type' => 'checkbox', 'class' => 'form-control',],
+        'file'              => ['type' => 'file', 'class' => 'form-control',],
         'video'              => ['type' => 'text', 'class' => 'form-control',],
         'date'				=> ['type' => 'date', 'class' => 'form-control',],
         'text'				=> ['type' => 'textarea', 'class' => 'form-control'],

common/modules/reviews/models/Reviews.php

@@ -34,11 +34,6 @@ use Yii;
  */
 class Reviews extends \common\components\ActiveRecordModel
 {
-    const PHOTO_FOLDER = '/uploads/reviews/';
-
-    public $image;
-    public $photo_delete = false;
-
     private static $rate = [
         'rate_usability' => [
             0 => 'Не определено',
@@ -83,12 +78,22 @@ class Reviews extends \common\components\ActiveRecordModel
         return 'Отзывы';
     }
 
-    // public function getUser() {
-    //     return $this->hasOne(\common\modules\scoring\models\ScClient::className(), ['id' => 'user_id']);
-    // }
-
-    public function getOperator() {
-        return $this->hasOne(\common\modules\users\models\User::className(), ['id' => 'admin_id']);
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'langs' => [
+                'class' => 'common\modules\blog\components\PostLangBehavior',
+            ],
+            'file' => [
+                'class' => 'common\components\activeRecordBehaviors\FileUploadBehavior',
+                'path' => '@frontend/web',
+                'folder' => '/uploads/reviews/',
+                'field' => 'photo'
+            ],
+        ];
     }
 
     /**
@@ -99,23 +104,16 @@ class Reviews extends \common\components\ActiveRecordModel
         return [
             [['text', 'date', 'notification_send', 'show_in_module'], 'required'],
             [['admin_id', 'priority', 'notification_send', 'order', 'cat_id', 'show_in_module', 'rate_usability', 'rate_loyality', 'rate_profit'], 'integer'],
-            [['image'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif'],
+            [['file'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif'],
             [['text', 'state', 'attendant_products'], 'string'],
             [['admin_id'], 'adminIdValidate'],
-            [['date', 'answer', 'good', 'bad', 'date_create', 'notification_date', 'rate_usability', 'rate_loyality', 'rate_profit', 'title', 'order', 'photo', 'state', 'video', 'photo_delete'], 'safe'],
+            [['date', 'answer', 'good', 'bad', 'date_create', 'notification_date', 'rate_usability', 'rate_loyality', 'rate_profit', 'title', 'order', 'photo', 'state', 'video', 'unlinkFile'], 'safe'],
             // [['lang'], 'string', 'max' => 2],
             [['title'], 'string', 'max' => 250],
             [['email', 'video'], 'string', 'max' => 255]
         ];
     }
 
-    public function adminIdValidate($attr, $value) {
-        if(empty($this->answer))
-            if(empty($this->$attr))
-                $this->addError($attr, 'Выберите опреатора');
-
-    }
-
     /**
      * @inheritdoc
      */
@@ -133,7 +131,7 @@ class Reviews extends \common\components\ActiveRecordModel
             'bad' => Yii::t('reviews', 'Не понравилось'),
             'photo' => Yii::t('reviews', 'Фото'),
             'video' => Yii::t('reviews', 'Ссылка на видео'),
-            'image' => Yii::t('reviews', 'Фото'),
+            'file' => Yii::t('reviews', 'Фото'),
             'state' => Yii::t('reviews', 'Состояние'),
             'date' => Yii::t('reviews', 'Дата'),
             'date_create' => Yii::t('reviews', 'Создана'),
@@ -148,10 +146,17 @@ class Reviews extends \common\components\ActiveRecordModel
             'rate_usability' => Yii::t('reviews', 'Удобство'),
             'rate_loyality' => Yii::t('reviews', 'Лояльность'),
             'rate_profit' => Yii::t('reviews', 'Выгода'),
-            'photo_delete' => 'Удалить фото'
+            'unlinkFile' => 'Удалить фото'
         ];
     }
 
+    public function adminIdValidate($attr, $value) {
+        if(empty($this->answer))
+            if(empty($this->$attr))
+                $this->addError($attr, 'Выберите опреатора');
+
+    }
+
     public function hasComment() {
         if(!empty($this->answer))
             return true;
@@ -207,35 +212,8 @@ class Reviews extends \common\components\ActiveRecordModel
         return parent::beforeSave($insert);
     }
 
-    private function getPath()
+    public function getOperator() 
     {
-        return Yii::getAlias('@frontend/web') . self::PHOTO_FOLDER;
-    }
-
-    public function upload()
-    {
-        if ($this->validate()) 
-        {
-            if(!file_exists($this->getPath()))
-            {
-                mkdir($this->getPath(), 0777, true);
-            }
-
-            $this->photo = date('dmYHis-') . uniqid() . '.' . $this->image->extension;
-            $this->image->saveAs($this->getPath() . $this->photo);
-            return true;
-        } 
-        else 
-        {
-            return false;
-        }
-    }
-
-    public function deletePhoto()
-    {
-        if(file_exists($this->getPath() . $this->photo))
-        {
-            unlink($this->getPath() . $this->photo);
-        }
+        return $this->hasOne(\common\modules\users\models\User::className(), ['id' => 'admin_id']);
     }
 }

frontend/views/layouts/block/about-reviews.php

@@ -22,7 +22,7 @@ $reviews = Reviews::find()
                         <?php if($review->photo) : ?>
                             <div class="col-md-3 col-xs-4 col-sm-12">
                                 <div class="rev_img">
-                                    <img src="<?=Reviews::PHOTO_FOLDER . $review->photo?>">
+                                    <img src="<?=$review->photo?>">
                                 </div>
                             </div>
                         <?php endif; ?>

frontend/views/layouts/block/reviews.php

@@ -21,7 +21,7 @@ $reviews = Reviews::find()
                         <?php if($review->photo) : ?>
                             <div class="col-md-3 col-xs-4 col-sm-12">
                                 <div class="rev_img">
-                                    <img src="<?=Reviews::PHOTO_FOLDER . $review->photo?>">
+                                    <img src="<?=$review->photo?>">
                                 </div>
                             </div>
                         <?php endif; ?>