Skip to content

Commit a669a95

Browse files
author
Oleksii Korshenko
authored
Merge pull request #332 from magento-firedrakes
Fixed issues: - MAGETWO-55054: Can't update values of multiselect attribute from backend over multiple products #5459 - MAGETWO-57390: [Backport] - Cursor no appearing when editing product description (bug in TinyMCE) - for 2.0
2 parents f3adf92 + bda126b commit a669a95

File tree

2 files changed

+3
-2
lines changed
  • app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute
  • lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default

2 files changed

+3
-2
lines changed

app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function execute()
132132
$attributesData[$attributeCode] = $value;
133133
} elseif ($attribute->getFrontendInput() == 'multiselect') {
134134
// Check if 'Change' checkbox has been checked by admin for this attribute
135-
$isChanged = (bool)$this->getRequest()->getPost($attributeCode . '_checkbox');
135+
$isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
136136
if (!$isChanged) {
137137
unset($attributesData[$attributeCode]);
138138
continue;

lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
html {height: 100%;}
67
body, td, pre { color:#2f2f2f; font-family:Arial, Helvetica, sans-serif; font-size:12px; margin:8px; }
7-
body { background:#fff; }
8+
body {background:#fff; min-height: calc(100% - 20px);}
89
body.mceForceColors { background:#fff; color:#2f2f2f; }
910
h1 {font-size: 2em}
1011
h2 {font-size: 1.5em}

0 commit comments

Comments
 (0)