Skip to content

Commit b26ec35

Browse files
authored
Fixed bulk attribute update toggleFieldEditMode crash (#620)
1 parent 0ccd621 commit b26ec35

File tree

2 files changed

+10
-8
lines changed
  • app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab
  • public/js/mage/adminhtml

2 files changed

+10
-8
lines changed

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function _getAdditionalElementHtml($element)
8585
$nameAttributeHtml = ($element->getExtType() === 'multiple') ? 'name="' . $element->getId() . '_checkbox"'
8686
: '';
8787
return '<span class="attribute-change-checkbox"><input type="checkbox" id="' . $element->getId()
88-
. '-checkbox" ' . $nameAttributeHtml . ' onclick="toogleFieldEditMode(this, \'' . $element->getId()
88+
. '-checkbox" ' . $nameAttributeHtml . ' onclick="toggleFieldEditMode(this, \'' . $element->getId()
8989
. '\')" /><label for="' . $element->getId() . '-checkbox">' . Mage::helper('catalog')->__('Change')
9090
. '</label></span>
9191
<script type="text/javascript">initDisableFields(\'' . $element->getId() . '\')</script>';

public/js/mage/adminhtml/product.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ Product.Gallery = class {
166166
this.images[index].removed = (this.getFileElement(file, 'cell-remove input').checked ? 1 : 0);
167167
this.images[index].disabled = (this.getFileElement(file, 'cell-disable input').checked ? 1 : 0);
168168
this.getElement('save').value = JSON.stringify(this.images);
169-
this.updateState(file);
170169
this.container.setHasChanges();
171170
}
172171
loadImage(file) {
@@ -213,10 +212,6 @@ Product.Gallery = class {
213212
this.getFileElement(file, 'cell-' + pair[0] + ' input').checked = true;
214213
}
215214
}.bind(this));
216-
this.updateState(file);
217-
}
218-
updateState(file) {
219-
// deprecated
220215
}
221216
getFileElement(file, element) {
222217
var selector = '#' + this.prepareId(file) + ' .' + element;
@@ -912,14 +907,21 @@ showNoticeMessage() {
912907

913908
var onInitDisableFieldsList = [];
914909

915-
function toogleFieldEditMode(toogleIdentifier, fieldContainer) {
916-
if (document.getElementById(toogleIdentifier).checked) {
910+
function toggleFieldEditMode(toggleIdentifier, fieldContainer) {
911+
const el = (toggleIdentifier instanceof HTMLElement) ? toggleIdentifier : document.getElementById(toggleIdentifier);
912+
if (el && el.checked) {
917913
enableFieldEditMode(fieldContainer);
918914
} else {
919915
disableFieldEditMode(fieldContainer);
920916
}
921917
}
922918

919+
/** @deprecated since 26.3 Use toggleFieldEditMode instead */
920+
function toogleFieldEditMode(toogleIdentifier, fieldContainer) {
921+
console.warn('toogleFieldEditMode is deprecated, use toggleFieldEditMode instead');
922+
toggleFieldEditMode(toogleIdentifier, fieldContainer);
923+
}
924+
923925
function disableFieldEditMode(fieldContainer) {
924926
if (document.getElementById(fieldContainer)) {
925927
document.getElementById(fieldContainer).disabled = true;

0 commit comments

Comments
 (0)