From 5024e165b6483bb5cff36c498af94263b8d92235 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 16 Jan 2025 09:52:31 +0100 Subject: [PATCH 1/5] Fix: error in admin customer edit account (#4488) --- .../core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php | 2 +- .../core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php index 23c8f94f270..64edcb7edac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php @@ -85,7 +85,7 @@ protected function _prepareForm() $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $fieldset->setRenderer($renderer); + $field->setRenderer($renderer); } } else { $fieldset->addField('store_id', 'hidden', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index ef85b2ecdd6..cdf1146b539 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -168,7 +168,7 @@ function(v, elem){ $renderer = $this->getLayout()->createBlock('adminhtml/customer_edit_renderer_newpass'); if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $fieldset->setRenderer($renderer); + $field->setRenderer($renderer); } // Prepare customer confirmation control (only for existing customers) @@ -209,7 +209,7 @@ function(v, elem){ $renderer = $this->getLayout()->createBlock('adminhtml/customer_edit_renderer_adminpass'); if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $fieldset->setRenderer($renderer); + $field->setRenderer($renderer); } } } @@ -233,7 +233,7 @@ function(v, elem){ $renderer = $this->getLayout()->createBlock('adminhtml/customer_edit_renderer_newpass'); if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $fieldset->setRenderer($renderer); + $field->setRenderer($renderer); } // Prepare send welcome email checkbox From a9bbdc69de1bcd8e7476db43bab1d1c1945b10e7 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Fri, 17 Jan 2025 09:55:35 +0100 Subject: [PATCH 2/5] Update .all-contributorsrc (#4481) --- .all-contributorsrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 87b75a56887..517ed43c37f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6,10 +6,10 @@ "files": [ "README.md" ], - "imageSize": 35, + "imageSize": 100, "commit": true, "commitConvention": "none", - "contributorsPerLine": 20, + "contributorsPerLine": 7, "contributorTemplate": "\">\" loading=\"lazy\" width=\"<%= options.imageSize %>\" alt=\"\"/>
<%= contributor.name %>", "badgeTemplate": "-orange.svg\" alt=\"All Contributors\">", "wrapperTemplate": "\n\n <%= bodyContent %> \n<%= tableFooterContent %>
\n\n", From d6d09a793458b43d86466cc87dba5df48f43554d Mon Sep 17 00:00:00 2001 From: Caprico <2081806+Caprico85@users.noreply.github.com> Date: Fri, 17 Jan 2025 18:12:38 +0100 Subject: [PATCH 3/5] Fix: error in admin edit cart rule (#4493) --- .../core/Mage/Rule/Model/Action/Abstract.php | 42 +++++++++++-------- .../Mage/Rule/Model/Action/Collection.php | 14 ++++--- .../Mage/Rule/Model/Condition/Abstract.php | 14 ++++--- .../Mage/Rule/Model/Condition/Combine.php | 28 +++++++------ 4 files changed, 56 insertions(+), 42 deletions(-) diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php index 825105f2398..608e9f64f78 100644 --- a/app/code/core/Mage/Rule/Model/Action/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php @@ -254,17 +254,19 @@ public function getTypeElement() */ public function getAttributeElement() { - $renderer = Mage::getBlockSingleton('rule/editable'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField('action:' . $this->getId() . ':attribute', 'select', [ + $element = $this->getForm()->addField('action:' . $this->getId() . ':attribute', 'select', [ 'name' => 'rule[actions][' . $this->getId() . '][attribute]', 'values' => $this->getAttributeSelectOptions(), 'value' => $this->getAttribute(), 'value_name' => $this->getAttributeName(), ]); + + $renderer = Mage::getBlockSingleton('rule/editable'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /** @@ -272,17 +274,19 @@ public function getAttributeElement() */ public function getOperatorElement() { - $renderer = Mage::getBlockSingleton('rule/editable'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField('action:' . $this->getId() . ':operator', 'select', [ + $element = $this->getForm()->addField('action:' . $this->getId() . ':operator', 'select', [ 'name' => 'rule[actions][' . $this->getId() . '][operator]', 'values' => $this->getOperatorSelectOptions(), 'value' => $this->getOperator(), 'value_name' => $this->getOperatorName(), ]); + + $renderer = Mage::getBlockSingleton('rule/editable'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /** @@ -290,16 +294,18 @@ public function getOperatorElement() */ public function getValueElement() { - $renderer = Mage::getBlockSingleton('rule/editable'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField('action:' . $this->getId() . ':value', 'text', [ + $element = $this->getForm()->addField('action:' . $this->getId() . ':value', 'text', [ 'name' => 'rule[actions][' . $this->getId() . '][value]', 'value' => $this->getValue(), 'value_name' => $this->getValueName(), ]); + + $renderer = Mage::getBlockSingleton('rule/editable'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /** diff --git a/app/code/core/Mage/Rule/Model/Action/Collection.php b/app/code/core/Mage/Rule/Model/Action/Collection.php index b1415ecd24f..ce8ef27fe14 100644 --- a/app/code/core/Mage/Rule/Model/Action/Collection.php +++ b/app/code/core/Mage/Rule/Model/Action/Collection.php @@ -108,16 +108,18 @@ public function asHtml() */ public function getNewChildElement() { - $renderer = Mage::getBlockSingleton('rule/newchild'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField('action:' . $this->getId() . ':new_child', 'select', [ + $element = $this->getForm()->addField('action:' . $this->getId() . ':new_child', 'select', [ 'name' => 'rule[actions][' . $this->getId() . '][new_child]', 'values' => $this->getNewChildSelectOptions(), 'value_name' => $this->getNewChildName(), ]); + + $renderer = Mage::getBlockSingleton('rule/newchild'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /** diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php index 6971636b985..b55b4630693 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php @@ -509,17 +509,19 @@ public function getAttributeElement() } } - $renderer = Mage::getBlockSingleton('rule/editable'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__attribute', 'select', [ + $element = $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__attribute', 'select', [ 'name' => 'rule[' . $this->getPrefix() . '][' . $this->getId() . '][attribute]', 'values' => $this->getAttributeSelectOptions(), 'value' => $this->getAttribute(), 'value_name' => $this->getAttributeName(), ]); + + $renderer = Mage::getBlockSingleton('rule/editable'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /** diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php index a462a0fc075..4b75d54ed91 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Combine.php +++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php @@ -147,17 +147,19 @@ public function getAggregatorElement() } } - $renderer = Mage::getBlockSingleton('rule/editable'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__aggregator', 'select', [ + $element = $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__aggregator', 'select', [ 'name' => 'rule[' . $this->getPrefix() . '][' . $this->getId() . '][aggregator]', 'values' => $this->getAggregatorSelectOptions(), 'value' => $this->getAggregator(), 'value_name' => $this->getAggregatorName(), ]); + + $renderer = Mage::getBlockSingleton('rule/editable'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /* end aggregator methods */ @@ -308,16 +310,18 @@ public function asHtml() */ public function getNewChildElement() { - $renderer = Mage::getBlockSingleton('rule/newchild'); - if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { - $this->getForm()::setFieldsetRenderer($renderer); - } - - return $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__new_child', 'select', [ + $element = $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__new_child', 'select', [ 'name' => 'rule[' . $this->getPrefix() . '][' . $this->getId() . '][new_child]', 'values' => $this->getNewChildSelectOptions(), 'value_name' => $this->getNewChildName(), ]); + + $renderer = Mage::getBlockSingleton('rule/newchild'); + if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) { + $element->setRenderer($renderer); + } + + return $element; } /** From 9695d73b8a00ebaeb2dd0ffb2806f1e1310973b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?En=C3=A9ias=20Ramos=20de=20Melo?= Date: Fri, 17 Jan 2025 14:13:30 -0300 Subject: [PATCH 4/5] Fix: InvalidParamTypeProvidedNULL: fixed login() method (#4399) * bugfix/InvalidParamTypeProvidedNULL: fixed param apiKey = null in login() method * Update app/code/core/Mage/Api/Model/Server/Handler/Abstract.php --------- Co-authored-by: Sven Reichel Co-authored-by: Ng Kiat Siong --- app/code/core/Mage/Api/Model/Server/Handler/Abstract.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index 2e5198c5a0c..faa42fb42f0 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -204,7 +204,7 @@ protected function _prepareResourceModelName($resource) * Login user and Retrieve session id * * @param string $username - * @param string|null $apiKey + * @param string $apiKey * @return stdClass|string|void */ public function login($username, $apiKey = null) From 5496d8a9d1c3895b5f55df2e89737abe1890757e Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 17 Jan 2025 18:59:15 +0100 Subject: [PATCH 5/5] No Layout on Redirect in CatalogSearch AdvancedController (#4494) Closes #3389 Co-authored-by: Sven Reichel --- .../core/Mage/CatalogSearch/controllers/AdvancedController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php index 0790b5674df..15f667bff48 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php @@ -42,6 +42,7 @@ public function resultAction() ->setQueryParams($this->getRequest()->getQuery()) ->getUrl('*/*/'), ); + return; } $this->_initLayoutMessages('catalog/session'); $this->renderLayout();