From c3019fff5d2a969121b77eaf7fc39177f388086f Mon Sep 17 00:00:00 2001 From: Sonja Riesterer Date: Thu, 22 Feb 2018 15:56:29 +0100 Subject: [PATCH 1/3] Change of Banner Link The banner stilled linked to the old website. Changed it to our new website --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d930c45..4f3fcef 100644 --- a/README.md +++ b/README.md @@ -99,4 +99,4 @@ It offers more features, such as an extensive autosuggest window, multiselect fi categories loaded via Solr and support of Magento Enterprise Edition. For more information, please visit our [website](https://www.integer-net.com/solr-magento/). -[![Upgrade to IntegerNet_Solr Pro](src/skin/adminhtml/default/default/integernet/solr/solr_free_banner_upgrade_to_pro.png)](http://integernet-solr.com/features/?utm_source=readme&utm_medium=banner&utm_term=features&utm_content=features&utm_campaign=upgrade) +[![Upgrade to IntegerNet_Solr Pro](src/skin/adminhtml/default/default/integernet/solr/solr_free_banner_upgrade_to_pro.png)](https://integernet-solr.com/features/?utm_source=readme&utm_medium=banner&utm_term=features&utm_content=features&utm_campaign=upgrade) From dbc2925aad26630ca4375eb6ae2de53a69ccf24a Mon Sep 17 00:00:00 2001 From: Andrzej Rosiek Date: Tue, 28 Aug 2018 10:40:52 +0200 Subject: [PATCH 2/3] fix for category filters which should be hidden but didn't work with flat category collection --- .../IntegerNet/Solr/Model/Observer.php | 26 ++++++++++++++++++- .../community/IntegerNet/Solr/etc/config.xml | 11 +++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/app/code/community/IntegerNet/Solr/Model/Observer.php b/src/app/code/community/IntegerNet/Solr/Model/Observer.php index 3fcb1f9..79654ea 100644 --- a/src/app/code/community/IntegerNet/Solr/Model/Observer.php +++ b/src/app/code/community/IntegerNet/Solr/Model/Observer.php @@ -326,4 +326,28 @@ public function afterFastSimpleImportReindex(Varien_Event_Observer $observer) Mage::helper('integernet_solr')->factory()->getProductIndexer()->reindex($productIds); } -} \ No newline at end of file + + public function afterFlatCategoryLoadedUseBackendModel(Varien_Event_Observer $observer) + { + if (!Mage::getStoreConfigFlag('integernet_solr/general/is_active')) { + return; + } + + /** @var Mage_Catalog_Model_Category $category */ + $category = $observer->getCategory(); + + if (!$category || !$category->getId()) { + return; + } + + if (Mage::helper('catalog/category_flat')->isEnabled() && !$category->getResource() instanceof Mage_Catalog_Model_Resource_Category_Flat) { + return; + } + + $filtersToRemove = $category->getData('solr_remove_filters'); + + if ($filtersToRemove && !is_array($filtersToRemove)) { + $category->setData('solr_remove_filters', explode(',', $filtersToRemove)); + } + } +} diff --git a/src/app/code/community/IntegerNet/Solr/etc/config.xml b/src/app/code/community/IntegerNet/Solr/etc/config.xml index 57d85f2..220877a 100644 --- a/src/app/code/community/IntegerNet/Solr/etc/config.xml +++ b/src/app/code/community/IntegerNet/Solr/etc/config.xml @@ -230,6 +230,15 @@ + + + + singleton + integernet_solr/observer + afterFlatCategoryLoadedUseBackendModel + + + @@ -282,4 +291,4 @@ - \ No newline at end of file + From bb8f10e74ded42747e27c8210524565ec01a1882 Mon Sep 17 00:00:00 2001 From: Andrzej Rosiek Date: Thu, 30 Aug 2018 18:00:43 +0200 Subject: [PATCH 3/3] IntegerNet_Solr fix should be applied only for flat categories --- src/app/code/community/IntegerNet/Solr/Model/Observer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/code/community/IntegerNet/Solr/Model/Observer.php b/src/app/code/community/IntegerNet/Solr/Model/Observer.php index 79654ea..58edaf0 100644 --- a/src/app/code/community/IntegerNet/Solr/Model/Observer.php +++ b/src/app/code/community/IntegerNet/Solr/Model/Observer.php @@ -340,7 +340,7 @@ public function afterFlatCategoryLoadedUseBackendModel(Varien_Event_Observer $ob return; } - if (Mage::helper('catalog/category_flat')->isEnabled() && !$category->getResource() instanceof Mage_Catalog_Model_Resource_Category_Flat) { + if (!Mage::helper('catalog/category_flat')->isEnabled() || !$category->getResource() instanceof Mage_Catalog_Model_Resource_Category_Flat) { return; }