From 37524a68a19b90bc70bd52bf3e3c927a1522dc5c Mon Sep 17 00:00:00 2001
From: Egorka <error-202@mail.ru>
Date: Wed, 25 Jul 2018 00:18:34 +0300
Subject: [PATCH] Blog save-preview fix

---
 common/modules/blog/controllers/PostController.php | 11 +++---
 .../blog/controllers/manage/PostController.php     |  2 ++
 common/modules/blog/forms/BlogPostForm.php         |  2 ++
 common/modules/blog/views/manage/post/_form.php    |  8 ++++-
 common/modules/blog/views/post/post.php            |  4 +--
 common/modules/blog/widgets/PostByTagsWidget.php   | 42 ++++++++++++++++++++++
 .../modules/blog/widgets/views/slider-relative.php | 38 ++++++++++++++++++++
 7 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 common/modules/blog/widgets/PostByTagsWidget.php
 create mode 100644 common/modules/blog/widgets/views/slider-relative.php

diff --git a/common/modules/blog/controllers/PostController.php b/common/modules/blog/controllers/PostController.php
index 64bd745..e5775db 100644
--- a/common/modules/blog/controllers/PostController.php
+++ b/common/modules/blog/controllers/PostController.php
@@ -214,11 +214,12 @@ class PostController extends FrontendController
 			    $post->image = $filename;
 		    }
 
-		    $path = $post->getUploadedFilePath('image');
-		    FileHelper::createDirectory(pathinfo($path, PATHINFO_DIRNAME), 0775, true);
-		    $post->image->saveAs($path);
-
-		    $post->image = $post->getImageFileUrl('image');
+		    if ($post->image && !is_string($post->image)) {
+			    $path = $post->getUploadedFilePath( 'image' );
+			    FileHelper::createDirectory( pathinfo( $path, PATHINFO_DIRNAME ), 0775, true );
+			    $post->image->saveAs( $path );
+			    $post->image = $post->getImageFileUrl( 'image' );
+		    }
 
 		    return $this->render('post', [
 			    'post' => $post,
diff --git a/common/modules/blog/controllers/manage/PostController.php b/common/modules/blog/controllers/manage/PostController.php
index 43cad3f..0a6fc2f 100644
--- a/common/modules/blog/controllers/manage/PostController.php
+++ b/common/modules/blog/controllers/manage/PostController.php
@@ -87,6 +87,7 @@ class PostController extends Controller
     public function actionCreate()
     {
         $form = new BlogPostForm();
+        $form->action = 'create';
 	    $form->published_at = date('d.m.Y H:i:s');
         if ($form->load(Yii::$app->request->post()) && $form->validate()) {
             try {
@@ -112,6 +113,7 @@ class PostController extends Controller
     {
         $post = $this->findModel($id);
         $form = new BlogPostForm($post);
+	    $form->action = 'update';
         $form->published_at = date('d.m.Y H:i:s', $form->published_at);
         if ($form->load(Yii::$app->request->post()) && $form->validate()) {
             try {
diff --git a/common/modules/blog/forms/BlogPostForm.php b/common/modules/blog/forms/BlogPostForm.php
index eb03dbe..19a5349 100644
--- a/common/modules/blog/forms/BlogPostForm.php
+++ b/common/modules/blog/forms/BlogPostForm.php
@@ -17,6 +17,8 @@ use Yii;
  */
 class BlogPostForm extends CompositeForm
 {
+	public $action;
+
     public $category_id;
     public $title;
     public $description;
diff --git a/common/modules/blog/views/manage/post/_form.php b/common/modules/blog/views/manage/post/_form.php
index c5988f0..6be3c16 100644
--- a/common/modules/blog/views/manage/post/_form.php
+++ b/common/modules/blog/views/manage/post/_form.php
@@ -149,7 +149,13 @@ $this->registerJs($js2);
 		    </div>
 
 		    <div class="form-group">
-		        <?= Html::submitButton(Yii::t('buttons', 'Save'), ['class' => 'btn btn-success']) ?>
+		        <?= Html::submitButton(Yii::t('buttons', 'Save'), [
+		        	'class' => 'btn btn-success',
+			        'value'=>'save',
+			        'name'=>'submit_save',
+			        'formaction' => Yii::$app->request->getUrl(),
+			        'formtarget' => '_self',
+		        ]) ?>
 		    </div>
 
 
diff --git a/common/modules/blog/views/post/post.php b/common/modules/blog/views/post/post.php
index 1bd0d9c..8b5c305 100644
--- a/common/modules/blog/views/post/post.php
+++ b/common/modules/blog/views/post/post.php
@@ -3,7 +3,7 @@
 /* @var $this yii\web\View */
 /* @var $post \common\modules\blog\entities\BlogPost */
 
-use frontend\widgets\post\CommentsWidget;
+use common\modules\blog\widgets\CommentsWidget;
 use yii\helpers\Html;
 use yii\helpers\Url;
 
@@ -98,7 +98,7 @@ $this->registerJs($js, $this::POS_READY);
 	</div>
 </div>
 
-<?= \frontend\widgets\post\PostByTagsWidget::widget([
+<?= \common\modules\blog\widgets\PostByTagsWidget::widget([
 	'count' => 10,
 	'view' => 'slider-relative',
 	'post' => $post,
diff --git a/common/modules/blog/widgets/PostByTagsWidget.php b/common/modules/blog/widgets/PostByTagsWidget.php
new file mode 100644
index 0000000..50f1003
--- /dev/null
+++ b/common/modules/blog/widgets/PostByTagsWidget.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 24.01.2018
+ */
+
+namespace common\modules\blog\widgets;
+
+
+use common\modules\blog\entities\BlogTagAssignment;
+use common\modules\blog\repositories\read\BlogPostReadRepository;
+use yii\base\Widget;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Url;
+
+class PostByTagsWidget extends Widget
+{
+	public $count;
+	public $view;
+	public $post;
+
+	public $posts;
+
+	public function __construct(BlogPostReadRepository $posts, $config = [])
+	{
+		parent::__construct($config);
+		$this->count = $this->count ? $this->count : 5;
+		$this->posts = $posts;
+	}
+
+	public function run(): string
+	{
+		$tag_ids = ArrayHelper::getColumn(BlogTagAssignment::find()->andWhere(['post_id' => $this->post->id])->all(), 'tag_id');
+		$posts = $this->posts->getByTagsId($this->post, $tag_ids, $this->count)->getModels();
+
+		return $this->render($this->view, [
+			'posts' => $posts,
+			'view' => $this->view,
+			'url' => Url::canonical(),
+		]);
+	}
+}
\ No newline at end of file
diff --git a/common/modules/blog/widgets/views/slider-relative.php b/common/modules/blog/widgets/views/slider-relative.php
new file mode 100644
index 0000000..c06485b
--- /dev/null
+++ b/common/modules/blog/widgets/views/slider-relative.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @var $this \yii\web\View
+ * @var $view string
+ * @var $posts \common\modules\blog\entities\BlogPost[]
+ */
+
+?>
+
+<div class="row">
+	<div class="col-sm-12 owl-carousel-outer-navigation">
+		<!-- Heading Component-->
+		<article class="heading-component">
+			<div class="heading-component-inner">
+				<h5 class="heading-component-title"><?= Yii::t('post', 'Related') ?>
+				</h5>
+				<div class="owl-carousel-arrows-outline">
+					<div class="owl-nav">
+						<button class="owl-arrow owl-arrow-prev" id="relative-button-prev"></button>
+						<button class="owl-arrow owl-arrow-next" id="relative-button-next"></button>
+					</div>
+				</div>
+			</div>
+		</article>
+
+		<!-- Blog Carousel-->
+		<div id="relative_carousel" class="owl-carousel row">
+				<?php foreach ($posts as $post): ?>
+
+					<?= $this->render($view . '_item', [
+						'post' => $post
+					]) ?>
+
+				<?php endforeach; ?>
+		</div>
+	</div>
+</div>
\ No newline at end of file