From d7ee8579864d2980124606db3db224e0b2d9e715 Mon Sep 17 00:00:00 2001
From: termos008 <34942603+termos008@users.noreply.github.com>
Date: Fri, 5 Jan 2018 15:47:28 +0200
Subject: [PATCH 1/6] Update Post.php

---
 Model/Post.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Model/Post.php b/Model/Post.php
index 67688ff7..cfdc2976 100755
--- a/Model/Post.php
+++ b/Model/Post.php
@@ -844,7 +844,6 @@ public function getSecret()
             );
             $this->save();
         }
-
         return $this->getData('secret');
     }
 }

From bef1f8562ed7a9c84bcc8d5e9327de3d1da09933 Mon Sep 17 00:00:00 2001
From: termos008 <34942603+termos008@users.noreply.github.com>
Date: Fri, 5 Jan 2018 15:48:02 +0200
Subject: [PATCH 2/6] Update PostManagement.php

---
 Model/PostManagement.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Model/PostManagement.php b/Model/PostManagement.php
index 929948fc..6546b390 100644
--- a/Model/PostManagement.php
+++ b/Model/PostManagement.php
@@ -84,7 +84,6 @@ public function getList($type, $term, $storeId, $page, $limit)
                     $collection->addTagFilter($term);
                     break;
             }
-
             $posts = [];
             foreach ($collection as $item) {
                 $item->initDinamicData();

From 956ca48c0890b8e0dda2ce57c452898b7205018e Mon Sep 17 00:00:00 2001
From: termos008 <34942603+termos008@users.noreply.github.com>
Date: Fri, 5 Jan 2018 15:49:14 +0200
Subject: [PATCH 3/6] Update Collection.php

---
 Model/ResourceModel/Post/Collection.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Model/ResourceModel/Post/Collection.php b/Model/ResourceModel/Post/Collection.php
index dc2ae086..9b493e1e 100755
--- a/Model/ResourceModel/Post/Collection.php
+++ b/Model/ResourceModel/Post/Collection.php
@@ -130,7 +130,12 @@ public function addStoreFilter($store, $withAdmin = true)
         }
         return $this;
     }
-
+    
+    public function addRecentFilter()
+    {
+      return $this->addFieldToFilter('include_in_recent', 1);
+    }
+    
     /**
      * Add posts filter to collection
      * @param array|int|string  $category

From 9828d7b04e7e3d5109a688c1e5638cf9645fecb2 Mon Sep 17 00:00:00 2001
From: termos008 <34942603+termos008@users.noreply.github.com>
Date: Fri, 5 Jan 2018 15:53:24 +0200
Subject: [PATCH 4/6] Update UpgradeSchema.php

---
 Setup/UpgradeSchema.php | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
index a037f471..d099e8e8 100644
--- a/Setup/UpgradeSchema.php
+++ b/Setup/UpgradeSchema.php
@@ -63,7 +63,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
 
         if (version_compare($version, '2.2.0') < 0) {
-            /* Add author field to posts tabel */
+            /* Add author field to posts table */
             $connection->addColumn(
                 $setup->getTable('magefan_blog_post'),
                 'author_id',
@@ -84,7 +84,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
 
 
         if (version_compare($version, '2.2.5') < 0) {
-            /* Add layout field to posts and category tabels */
+            /* Add layout field to posts and category table */
             foreach (['magefan_blog_post', 'magefan_blog_category'] as $table) {
                 $table = $setup->getTable($table);
                 $connection->addColumn(
@@ -165,7 +165,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
 
         if (version_compare($version, '2.3.0') < 0) {
-            /* Add meta title field to posts tabel */
+            /* Add meta title field to posts table */
             $connection->addColumn(
                 $setup->getTable('magefan_blog_post'),
                 'meta_title',
@@ -178,7 +178,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ]
             );
 
-            /* Add og tags fields to post tabel */
+            /* Add og tags fields to post table */
             foreach (['type', 'img', 'description', 'title'] as $type) {
                 $connection->addColumn(
                     $setup->getTable('magefan_blog_post'),
@@ -193,7 +193,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 );
             }
 
-            /* Add meta title field to category tabel */
+            /* Add meta title field to category table */
             $connection->addColumn(
                 $setup->getTable('magefan_blog_category'),
                 'meta_title',
@@ -452,7 +452,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
 
         if (version_compare($version, '2.6.2') < 0) {
-        /* Add include in menu field into categories tabel */
+        /* Add include in menu field into categories table */
             $connection->addColumn(
                 $setup->getTable('magefan_blog_category'),
                 'include_in_menu',
@@ -470,10 +470,27 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getIdxName($setup->getTable('magefan_blog_category'), ['include_in_menu']),
                 ['include_in_menu']
             );
+              if (version_compare($version, '2.6.3') < 0)
+             {
+            /* Add include in recent posts into post table */
+            $connection->addColumn(
+                $setup->getTable('magefan_blog_post'),
+                'include_in_recent',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+                    null,
+                    'nullable' => false,
+                    'default' => '1',
+                    'comment' => 'Include in Recent Posts',
+                    'after' => 'is_active'
+                ]
+            );
+        }
+
         }
 
         if (version_compare($version, '2.6.3') < 0) {
-        /* Add display mode field into category tabel */
+        /* Add display mode field into category table */
             $connection->addColumn(
                 $setup->getTable('magefan_blog_category'),
                 'display_mode',

From c4a5240b3f27c1ee4e0f03815daf07d864ab532f Mon Sep 17 00:00:00 2001
From: termos008 <34942603+termos008@users.noreply.github.com>
Date: Fri, 5 Jan 2018 15:55:05 +0200
Subject: [PATCH 5/6] Update blog_post_form.xml

---
 view/adminhtml/ui_component/blog_post_form.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/view/adminhtml/ui_component/blog_post_form.xml b/view/adminhtml/ui_component/blog_post_form.xml
index 8a7eaeac..48bf7a04 100644
--- a/view/adminhtml/ui_component/blog_post_form.xml
+++ b/view/adminhtml/ui_component/blog_post_form.xml
@@ -325,6 +325,24 @@
                 </argument>
             </container>
         </container>
+        <field name="include_in_recent">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="dataType" xsi:type="string">boolean</item>
+                    <item name="label" xsi:type="string" translate="true">Include in Recent Posts</item>
+                    <item name="formElement" xsi:type="string">checkbox</item>
+                    <item name="prefer" xsi:type="string">toggle</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="sortOrder" xsi:type="number">60</item>
+                    <item name="dataScope" xsi:type="string">include_in_recent</item>
+                    <item name="valueMap" xsi:type="array">
+                        <item name="true" xsi:type="number">1</item>
+                        <item name="false" xsi:type="number">0</item>
+                    </item>
+                    <item name="default" xsi:type="number">1</item>
+                </item>
+            </argument>
+        </field>
     </fieldset>
     <!-- Revert htmlContent to enable post gallery images on Magento 2.2.2
     <htmlContent name="gallery" sortOrder="22">

From 4e1015fab50835ea3c3a91c49f8b2d004ad06981 Mon Sep 17 00:00:00 2001
From: Ihor Vansach <ihor@magefan.com>
Date: Wed, 10 Jan 2018 15:38:05 +0200
Subject: [PATCH 6/6] Fixes for include in recent after code review

---
 Block/Index.php                         |  3 +++
 Block/Sidebar/Recent.php                | 11 ++++++++++
 Block/Widget/Recent.php                 |  1 +
 Model/Post.php                          |  1 +
 Model/PostManagement.php                |  1 +
 Model/ResourceModel/Post/Collection.php |  4 ++++
 Setup/UpgradeSchema.php                 | 28 ++++++++++++-------------
 etc/module.xml                          |  2 +-
 8 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/Block/Index.php b/Block/Index.php
index e9f20046..c2a897a1 100644
--- a/Block/Index.php
+++ b/Block/Index.php
@@ -48,6 +48,7 @@ protected function _preparePostCollection()
             \Magefan\Blog\Helper\Config::XML_PATH_HOMEPAGE_DISPLAY_MODE,
             ScopeInterface::SCOPE_STORE
         );
+
         /* If featured posts enabled */
         if ($displayMode == 1) {
             $postIds = $this->_scopeConfig->getValue(
@@ -55,6 +56,8 @@ protected function _preparePostCollection()
                 ScopeInterface::SCOPE_STORE
             );
             $this->_postCollection->addPostsFilter($postIds);
+        } else {
+            $this->_postCollection->addRecentFilter();
         }
     }
 
diff --git a/Block/Sidebar/Recent.php b/Block/Sidebar/Recent.php
index e7c00b74..8fb57404 100755
--- a/Block/Sidebar/Recent.php
+++ b/Block/Sidebar/Recent.php
@@ -34,6 +34,17 @@ public function _construct()
         return parent::_construct();
     }
 
+    /*
+     * Prepare posts collection
+     *
+     * @return void
+     */
+    protected function _preparePostCollection()
+    {
+        parent::_preparePostCollection();
+        $this->_postCollection->addRecentFilter();
+    }
+
     /**
      * Retrieve block identities
      * @return array
diff --git a/Block/Widget/Recent.php b/Block/Widget/Recent.php
index b3471b29..926125b5 100755
--- a/Block/Widget/Recent.php
+++ b/Block/Widget/Recent.php
@@ -91,6 +91,7 @@ protected function _preparePostCollection()
 
         parent::_preparePostCollection();
 
+        $this->_postCollection->addRecentFilter();
         if ($category = $this->getCategory()) {
             $this->_postCollection->addCategoryFilter($category);
         }
diff --git a/Model/Post.php b/Model/Post.php
index cfdc2976..67688ff7 100755
--- a/Model/Post.php
+++ b/Model/Post.php
@@ -844,6 +844,7 @@ public function getSecret()
             );
             $this->save();
         }
+
         return $this->getData('secret');
     }
 }
diff --git a/Model/PostManagement.php b/Model/PostManagement.php
index 6546b390..929948fc 100644
--- a/Model/PostManagement.php
+++ b/Model/PostManagement.php
@@ -84,6 +84,7 @@ public function getList($type, $term, $storeId, $page, $limit)
                     $collection->addTagFilter($term);
                     break;
             }
+
             $posts = [];
             foreach ($collection as $item) {
                 $item->initDinamicData();
diff --git a/Model/ResourceModel/Post/Collection.php b/Model/ResourceModel/Post/Collection.php
index 9b493e1e..2545cdfd 100755
--- a/Model/ResourceModel/Post/Collection.php
+++ b/Model/ResourceModel/Post/Collection.php
@@ -131,6 +131,10 @@ public function addStoreFilter($store, $withAdmin = true)
         return $this;
     }
     
+    /**
+     * Add "include in recent" filter to collection
+     * @return $this
+     */
     public function addRecentFilter()
     {
       return $this->addFieldToFilter('include_in_recent', 1);
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
index d099e8e8..28ba80c2 100644
--- a/Setup/UpgradeSchema.php
+++ b/Setup/UpgradeSchema.php
@@ -470,36 +470,36 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getIdxName($setup->getTable('magefan_blog_category'), ['include_in_menu']),
                 ['include_in_menu']
             );
-              if (version_compare($version, '2.6.3') < 0)
-             {
-            /* Add include in recent posts into post table */
+        }
+
+        if (version_compare($version, '2.6.3') < 0) {
+        /* Add display mode field into category table */
             $connection->addColumn(
-                $setup->getTable('magefan_blog_post'),
-                'include_in_recent',
+                $setup->getTable('magefan_blog_category'),
+                'display_mode',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                     null,
                     'nullable' => false,
-                    'default' => '1',
-                    'comment' => 'Include in Recent Posts',
+                    'default' => '0',
+                    'comment' => 'Display Mode',
                     'after' => 'is_active'
                 ]
             );
         }
 
-        }
 
-        if (version_compare($version, '2.6.3') < 0) {
-        /* Add display mode field into category table */
+        if (version_compare($version, '2.6.3.1') < 0) {
+            /* Add include in recent posts into post table */
             $connection->addColumn(
-                $setup->getTable('magefan_blog_category'),
-                'display_mode',
+                $setup->getTable('magefan_blog_post'),
+                'include_in_recent',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                     null,
                     'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Display Mode',
+                    'default' => '1',
+                    'comment' => 'Include in Recent Posts',
                     'after' => 'is_active'
                 ]
             );
diff --git a/etc/module.xml b/etc/module.xml
index 5b9805db..989f7940 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -8,7 +8,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magefan_Blog" setup_version="2.6.3">
+    <module name="Magefan_Blog" setup_version="2.6.3.1">
          <sequence>
             <module name="Magento_Cms"/>
             <module name="Magento_Catalog"/>