EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
after render fix
Yuri Kuznetsov9fd4d7848561
diff --git a/client/res/templates/site/master.tpl b/client/res/templates/site/master.tplindex 41b0c83a42..25d2c8d854 100644--- a/client/res/templates/site/master.tpl+++ b/client/res/templates/site/master.tpl@@ -3,3 +3,4 @@<div id="main" tabindex="-1">{{{main}}}</div></div><footer id="footer">{{{footer}}}</footer>+<div class="collapsed-modal-bar"></div>diff --git a/client/src/helpers/record-modal.js b/client/src/helpers/record-modal.jsindex 134a58977a..546340291a 100644--- a/client/src/helpers/record-modal.js+++ b/client/src/helpers/record-modal.js@@ -199,8 +199,6 @@ class RecordModalHelper {const barView = this.modalBarProvider.get();const foundModalView = barView.getModalViewList().find(view => {- console.log(view);-return view instanceof EditModalView &&view.id === id && view.entityType === entityType;});diff --git a/client/src/views/modal.js b/client/src/views/modal.jsindex f6a08fa6d3..14be9847aa 100644--- a/client/src/views/modal.js+++ b/client/src/views/modal.js@@ -1155,7 +1155,7 @@ class ModalView extends View {return;}- barView.addModalView(this, {title: title});+ await barView.addModalView(this, {title: title});}unchainFromParent() {diff --git a/client/src/views/site/master.js b/client/src/views/site/master.jsindex ec2d05ec31..f158db7606 100644--- a/client/src/views/site/master.js+++ b/client/src/views/site/master.js@@ -80,9 +80,9 @@ class MasterSiteView extends View {this.adjustContent();});- this.collapsedModalBarView = new CollapsedModalBarView({fullSelector: 'body > .collapsed-modal-bar'});+ this.collapsedModalBarView = new CollapsedModalBarView();- this.assignView('collapsedModalBar', this.collapsedModalBarView);+ this.assignView('collapsedModalBar', this.collapsedModalBarView, '> .collapsed-modal-bar');}/**diff --git a/package-lock.json b/package-lock.jsonindex 6f2fe63eac..469929b713 100644--- a/package-lock.json+++ b/package-lock.json@@ -19,7 +19,7 @@"bootstrap": "github:yurikuzn/espo-bootstrap#0.1.2","bootstrap-colorpicker": "^2.5.2","bootstrap-datepicker": "^1.9.0",- "bullbone": "github:espocrm/bullbone#1.3.2",+ "bullbone": "github:espocrm/bullbone#1.3.3","cronstrue": "^1.114.0","cropper": "^0.7.9","devbridge-autocomplete": "^1.4.11",@@ -2561,8 +2561,8 @@}},"node_modules/bullbone": {- "version": "1.3.2",- "resolved": "git+ssh://[email protected]/espocrm/bullbone.git#4c050fefefa5cab042ac1dce8d3c11f544e5ae5a"+ "version": "1.3.3",+ "resolved": "git+ssh://[email protected]/espocrm/bullbone.git#6f36d050687cac7f23a90fe9134be02657778fea"},"node_modules/bytes": {"version": "3.1.2",@@ -9189,8 +9189,8 @@"dev": true},"bullbone": {- "version": "git+ssh://[email protected]/espocrm/bullbone.git#4c050fefefa5cab042ac1dce8d3c11f544e5ae5a",- "from": "bullbone@github:espocrm/bullbone#1.3.2"+ "version": "git+ssh://[email protected]/espocrm/bullbone.git#6f36d050687cac7f23a90fe9134be02657778fea",+ "from": "bullbone@github:espocrm/bullbone#1.3.3"},"bytes": {"version": "3.1.2",diff --git a/package.json b/package.jsonindex 26a04e7539..07b29b6a3b 100644--- a/package.json+++ b/package.json@@ -49,7 +49,7 @@"bootstrap": "github:yurikuzn/espo-bootstrap#0.1.2","bootstrap-colorpicker": "^2.5.2","bootstrap-datepicker": "^1.9.0",- "bullbone": "github:espocrm/bullbone#1.3.2",+ "bullbone": "github:espocrm/bullbone#1.3.3","cronstrue": "^1.114.0","cropper": "^0.7.9","devbridge-autocomplete": "^1.4.11",