Merge branch 'hotfix/4.8.3'

2017-10-23 11:09:03 +03:00
parent 4706c971d6 987b838856
commit 6481f38f66
1 changed files with 8 additions and 0 deletions
@@ -62,6 +62,7 @@ Espo.define('views/admin/layouts/grid', 'views/admin/layouts/base', function (De
                    }
                });
                $(e.target).closest('ul.panels > li').remove();
+                this.normilizaDisabledItemList();
            },
            'click #layout a[data-action="addRow"]': function (e) {
                var tpl = this.unescape($("#layout-row-tpl").html());
@@ -76,6 +77,7 @@ Espo.define('views/admin/layouts/grid', 'views/admin/layouts/base', function (De
                    }
                });
                $(e.target).closest('ul.rows > li').remove();
+                this.normilizaDisabledItemList();
            },
            'click #layout a[data-action="removeField"]': function (e) {
                var el = $(e.target).closest('li');
@@ -166,6 +168,12 @@ Espo.define('views/admin/layouts/grid', 'views/admin/layouts/base', function (De
            }
        }, Dep.prototype.events),

+        normilizaDisabledItemList: function () {
+            $('#layout ul.cells.disabled > li').each(function (i, el) {
+                $(el).removeAttr('data-full-width');
+            }.bind(this));
+        },
+
        addPanel: function (data) {
            var tpl = this.unescape($("#layout-panel-tpl").html());