Merge pull request #428 from magefan/6648-blog-post-end-date

6648 blog post end date

Author: magefan

Controller/Adminhtml/Post/Save.php

@@ -162,7 +162,7 @@ protected function filterParams($data)
         $dateFilter = $this->_objectManager->create(\Magento\Framework\Stdlib\DateTime\Filter\Date::class);
 
         $filterRules = [];
-        foreach (['publish_time', 'custom_theme_from', 'custom_theme_to'] as $dateField) {
+        foreach (['publish_time', 'end_time', 'custom_theme_from', 'custom_theme_to'] as $dateField) {
             if (!empty($data[$dateField])) {
                 $filterRules[$dateField] = $dateFilter;
                 $data[$dateField] = preg_replace('/(.*)(\+\d\d\d\d\d\d)(\d\d)/U', '$1$3', $data[$dateField]);

Controller/Post/View.php

@@ -20,16 +20,24 @@ class View extends \Magefan\Blog\App\Action\Action
      */
     protected $_storeManager;
 
+    /**
+     * @var \Magefan\Blog\Model\Url
+     */
+    protected $url;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magefan\Blog\Model\Url $url
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magefan\Blog\Model\Url $url
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
+        $this->url = $url ?: $this->_objectManager->get(\Magefan\Blog\Model\Url::class);
     }
 
     /**
@@ -44,8 +52,12 @@ public function execute()
         }
 
         $post = $this->_initPost();
+
         if (!$post) {
-            return $this->_forwardNoroute();
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setHttpResponseCode(301);
+            $resultRedirect->setPath($this->url->getBaseUrl());
+            return $resultRedirect;
         }
 
         $this->_objectManager->get(\Magento\Framework\Registry::class)