Merge pull request #90 from ihor-klymchuk/master

Added short description field to blog post

Author: magefan

Model/Post.php

@@ -26,6 +26,7 @@
  * @method string getIdentifier()
  * @method $this setIdentifier(string $value)
  * @method string getContent()
+ * @method string getShortContent()
  * @method $this setContent(string $value)
  * @method string getContentHeading()
  * @method $this setContentHeading(string $value)
@@ -383,35 +384,41 @@ public function getShortFilteredContent()
     {
         $key = 'short_filtered_content';
         if (!$this->hasData($key)) {
-            $content = $this->getFilteredContent();
-            $pageBraker = '<!-- pagebreak -->';
-
-            $p = mb_strpos($content, $pageBraker);
-            if (!$p) {
-                $p = (int) $this->scopeConfig->getValue(
-                    'mfblog/post_list/shortcotent_length',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            if ($this->getShortContent()) {
+                $content = $this->filterProvider->getPageFilter()->filter(
+                    $this->getShortContent()
                 );
-            }
+            } else {
+                $content = $this->getFilteredContent();
+                $pageBraker = '<!-- pagebreak -->';
+
+                $p = mb_strpos($content, $pageBraker);
+                if (!$p) {
+                    $p = (int)$this->scopeConfig->getValue(
+                        'mfblog/post_list/shortcotent_length',
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                    );
+                }
 
-            if ($p) {
-                $content = mb_substr($content, 0, $p);
-                try {
-                    libxml_use_internal_errors(true);
-                    $dom = new \DOMDocument();
-                    $dom->loadHTML('<?xml encoding="UTF-8">' . $content);
-                    $body = $dom->getElementsByTagName('body');
-                    if ( $body && $body->length > 0 ) {
-                        $body = $body->item(0);
-                        $_content = new \DOMDocument;
-                        foreach ($body->childNodes as $child){
-                            $_content->appendChild($_content->importNode($child, true));
+                if ($p) {
+                    $content = mb_substr($content, 0, $p);
+                    try {
+                        libxml_use_internal_errors(true);
+                        $dom = new \DOMDocument();
+                        $dom->loadHTML('<?xml encoding="UTF-8">' . $content);
+                        $body = $dom->getElementsByTagName('body');
+                        if ($body && $body->length > 0) {
+                            $body = $body->item(0);
+                            $_content = new \DOMDocument;
+                            foreach ($body->childNodes as $child) {
+                                $_content->appendChild($_content->importNode($child, true));
+                            }
+                            $content = $_content->saveHTML();
                         }
-                        $content = $_content->saveHTML();
+                    } catch (\Exception $e) {
                     }
-                } catch (\Exception $e) {}
+                }
             }
-
             $this->setData($key, $content);
         }
 

Setup/UpgradeSchema.php

@@ -341,6 +341,19 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
 
         }
 
+        if (version_compare($version, '2.5.3') < 0) {
+            $connection->addColumn(
+                $setup->getTable('magefan_blog_post'),
+                'short_content',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'length' => '2M',
+                    'nullable' => true,
+                    'comment' => 'Post short content',
+                ]
+            );
+        }
+
         $setup->endSetup();
     }
 }

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.5.2">
+    <module name="Magefan_Blog" setup_version="2.5.3">
          <sequence>
             <module name="Magento_Cms"/>
             <module name="Magento_Catalog"/>

view/adminhtml/ui_component/blog_post_form.xml

@@ -176,6 +176,18 @@
                 </item>
             </argument>
         </field>
+        <field name="short_content">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string" translate="true">Short Content</item>
+                    <item name="formElement" xsi:type="string">wysiwyg</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="wysiwyg" xsi:type="boolean">true</item>
+                    <item name="dataScope" xsi:type="string">short_content</item>
+                    <item name="sortOrder" xsi:type="number">60</item>
+                </item>
+            </argument>
+        </field>
     </fieldset>
     <fieldset name="additional_options">
         <argument name="data" xsi:type="array">