Skip to content

Commit ca21231

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #19002: [Backport] Remove duplicated CSS selector (by @dmytro-ch) - #19074: [Backport] Fix for #12399: Exception Error in Catalog Price Rule while Backend language is not English (by @Mardl) - #19044: [2.2-develop] #14007: "Use in Layered Navigation: Filterable (no results)" property confuse for Price filter (by @vpodorozh) - #18985: [Backport] Added form fieldset before html data to \Magento\Framework\Data\Form\Element\Fieldset in getElementHtml() method (by @vasilii-b) Fixed GitHub Issues: - #12399: Exception Error in Catalog Price Rule while Backend language is not English (reported by @Drakas) has been fixed in #19074 by @Mardl in 2.2-develop branch Related commits: 1. a5a0b0b - #14007: "Use in Layered Navigation: Filterable (no results)" not working for `Price` attribute. (reported by @yogeshks) has been fixed in #19044 by @vpodorozh in 2.2-develop branch Related commits: 1. 52bfffc - #2618: Class \Magento\Framework\Data\Form\Element\Fieldset breaks specification of the parent class \Magento\Framework\Data\Form\Element\AbstractElement by not calling the method getBeforeElementHtml (getAfterElementHtml is called) (reported by @dmitry-fedyuk) has been fixed in #18985 by @vasilii-b in 2.2-develop branch Related commits: 1. 6629445
2 parents 0822bd7 + 27dc8e8 commit ca21231

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ public function execute()
6060
['request' => $this->getRequest()]
6161
);
6262
$data = $this->getRequest()->getPostValue();
63+
64+
$filterValues = ['from_date' => $this->_dateFilter];
65+
if ($this->getRequest()->getParam('to_date')) {
66+
$filterValues['to_date'] = $this->_dateFilter;
67+
}
68+
$inputFilter = new \Zend_Filter_Input(
69+
$filterValues,
70+
[],
71+
$data
72+
);
73+
$data = $inputFilter->getUnescaped();
6374
$id = $this->getRequest()->getParam('rule_id');
6475
if ($id) {
6576
$model = $ruleRepository->get($id);

app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
5555
'name' => 'is_filterable',
5656
'label' => __("Use in Layered Navigation"),
5757
'title' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price'),
58-
'note' => __('Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price.'),
58+
'note' => __(
59+
'Can be used only with catalog input type Yes/No, Dropdown, Multiple Select and Price.
60+
<br>Price is not compatible with <b>\'Filterable (no results)\'</b> option -
61+
it will make no affect on Price filter.'
62+
),
5963
'values' => [
6064
['value' => '0', 'label' => __('No')],
6165
['value' => '1', 'label' => __('Filterable (with results)')],

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,9 @@
630630
width: 1%;
631631
}
632632

633-
&-item-details {
634-
padding-bottom: 35px;
635-
}
636-
637633
&-item-details {
638634
display: table-cell;
635+
padding-bottom: 35px;
639636
vertical-align: top;
640637
white-space: normal;
641638
width: 99%;

lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public function __construct(
4343
*/
4444
public function getElementHtml()
4545
{
46-
$html = '<fieldset id="' . $this->getHtmlId() . '"' . $this->serialize(
46+
$html = $this->getBeforeElementHtml();
47+
$html .= '<fieldset area-hidden="false" id="' . $this->getHtmlId() . '"' . $this->serialize(
4748
['class']
4849
) . $this->_getUiId() . '>' . "\n";
4950
if ($this->getLegend()) {

0 commit comments

Comments
 (0)