Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor fixes on 'filter_condition_callback' method _filterStoreConditi… #2362

Merged
merged 5 commits into from
Aug 10, 2022
Merged

Minor fixes on 'filter_condition_callback' method _filterStoreConditi… #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
288c720
Minor fixes on 'filter_condition_callback' method _filterStoreConditi…
kiatng Aug 4, 2022
c54729a
Removed ignoreErrors from phpstan baseline.
kiatng Aug 5, 2022
2da8d6b
Merge branch '1.9.4.x' into _filterStoreCondition
sreichel Aug 9, 2022
6adb18d
Merge branch '1.9.4.x' into _filterStoreCondition
kiatng Aug 10, 2022
67584c4
Merge branch '_filterStoreCondition' of https://github.com/kiatng/mag…
kiatng Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,16 +265,6 @@ parameters:
count: 1
path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php

-
message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addStoreFilter\\(\\)\\.$#"
count: 1
path: ../app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php

-
message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addStoreFilter\\(\\)\\.$#"
count: 1
path: ../app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php

-
message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getNamePrefixOptions\\(\\)\\.$#"
count: 1
Expand Down
8 changes: 3 additions & 5 deletions app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,14 @@ protected function _afterLoadCollection()
}

/**
* @param Varien_Data_Collection $collection
* @param Mage_Checkout_Model_Resource_Agreement_Collection $collection
* @param Mage_Adminhtml_Block_Widget_Grid_Column $column
*/
protected function _filterStoreCondition($collection, $column)
{
if (!$value = $column->getFilter()->getValue()) {
return;
if ($value = $column->getFilter()->getValue()) {
$collection->addStoreFilter($value);
}

$this->getCollection()->addStoreFilter($value);
}

/**
Expand Down
10 changes: 6 additions & 4 deletions app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,15 @@ protected function _afterLoadCollection()
return parent::_afterLoadCollection();
}

/**
* @param Mage_Cms_Model_Resource_Block_Collection $collection
* @param Mage_Adminhtml_Block_Widget_Grid_Column $column
*/
protected function _filterStoreCondition($collection, $column)
{
if (!$value = $column->getFilter()->getValue()) {
return;
if ($value = $column->getFilter()->getValue()) {
$collection->addStoreFilter($value);
}

$this->getCollection()->addStoreFilter($value);
}

/**
Expand Down
10 changes: 6 additions & 4 deletions app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,15 @@ protected function _afterLoadCollection()
return parent::_afterLoadCollection();
}

/**
* @param Mage_Cms_Model_Resource_Page_Collection $collection
* @param Mage_Adminhtml_Block_Widget_Grid_Column $column
*/
protected function _filterStoreCondition($collection, $column)
{
if (!$value = $column->getFilter()->getValue()) {
return;
if ($value = $column->getFilter()->getValue()) {
$collection->addStoreFilter($value);
}

$this->getCollection()->addStoreFilter($value);
}

/**
Expand Down