Skip to content

Commit

Permalink
Merge pull request #412 from mageplaza/2.4-develop
Browse files Browse the repository at this point in the history
2.4 develop
  • Loading branch information
tamnt2708 committed Dec 20, 2023
2 parents 3f60615 + b4ad257 commit 131fdd7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"mageplaza/module-core": "^1.5.5"
},
"type": "magento2-module",
"version": "4.7.9",
"version": "4.7.10",
"license": "proprietary",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion view/adminhtml/web/js/grid/columns/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ define([
return this._super();
}

if (typeof this.modal[action.rowIndex] === 'undefined') {
if (typeof this.modal[action.rowIndex] === 'undefined' || typeof this.modal[action.rowIndex] === 'object') {
var row = this.rows[action.rowIndex],
modalHtml = '<iframe srcdoc="' + row['email_content'] + '" style="width: 100%; height: 100%"></iframe>';

Expand Down

0 comments on commit 131fdd7

Please sign in to comment.