EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsovd3c480d4816e
diff --git a/client/src/controller.js b/client/src/controller.jsindex b7e9fb490c..a1acea78b1 100644--- a/client/src/controller.js+++ b/client/src/controller.js@@ -78,7 +78,7 @@ class Controller {this._dateTime = injections.dateTime || null;this._broadcastChannel = injections.broadcastChannel || null;- this.set('masterRendered', false);+ this.setMasterRendered(false);}/**@@ -414,42 +414,89 @@ class Controller {* @private*/master(callback) {- const entire = this.get('entire');+ const entireView = this.getEntireView();- if (entire) {- entire.remove();+ if (entireView) {+ entireView.remove();- this.set('entire', null);+ this.setEntireView(null);}- const master = this.get('master');+ const masterView = this.getMasterView();- if (master) {- callback.call(this, master);+ if (masterView) {+ callback.call(this, masterView);return;}- const masterView = this.masterView || 'views/site/master';+ const viewName = this.masterView || 'views/site/master';- this.viewFactory.create(masterView, {fullSelector: 'body'}, /** module:view */master => {- this.set('master', master);+ this.viewFactory.create(viewName, {fullSelector: 'body'}, async /** module:view */masterView => {+ this.setMasterView(masterView);- if (this.get('masterRendered')) {- callback.call(this, master);+ if (this.isMasterRendered()) {+ callback.call(this, masterView);return;}- master.render()- .then(() => {- this.set('masterRendered', true);+ await masterView.render();++ this.setMasterRendered(true);- callback.call(this, master);- })+ callback.call(this, masterView);});}+ /**+ * @private+ * @return {import('view').default|null}+ */+ getEntireView() {+ return this.get('entire');+ }++ /**+ * @private+ * @param {import('view').default|null} view+ */+ setEntireView(view) {+ this.set('entire', view);+ }++ /**+ * @private+ * @return {import('view').default|null}+ */+ getMasterView() {+ return this.get('master');+ }++ /**+ * @private+ * @param {import('view').default|null} view+ */+ setMasterView(view) {+ this.set('master', view);+ }++ /**+ * @private+ * @param {boolean} value+ */+ setMasterRendered(value) {+ this.set('masterRendered', value);+ }++ /**+ * @private+ * @return {boolean}+ */+ isMasterRendered() {+ return !!this.get('masterRendered');+ }+/*** @param {import('views/site/master').default} masterView* @private@@ -507,7 +554,7 @@ class Controller {const viewName = !mainView ?(view || 'views/base') : undefined;- this.master(masterView => {+ this.master(async masterView => {if (dto.isCanceled) {return;}@@ -552,12 +599,11 @@ class Controller {if (mainView) {this._unchainMainView(masterView);- masterView.assignView('main', mainView, selector)- .then(() => {- dto.isSet = true;+ await masterView.assignView('main', mainView, selector)- this._processMain(view, masterView, dto);- });+ dto.isSet = true;++ this._processMain(view, masterView, dto);return;}@@ -647,7 +693,7 @@ class Controller {* Show a loading notify-message.*/showLoadingNotification() {- const master = this.get('master');+ const master = this.getMasterView();if (!master) {return;@@ -660,7 +706,7 @@ class Controller {* Hide a loading notify-message.*/hideLoadingNotification() {- const master = this.get('master');+ const master = this.getMasterView();if (!master) {return;@@ -678,14 +724,14 @@ class Controller {* @param {module:controller~viewCallback} [callback] A callback with a created view.*/entire(view, options, callback) {- const masterView = this.get('master');+ const masterView = this.getMasterView();if (masterView) {masterView.remove();}- this.set('master', null);- this.set('masterRendered', false);+ this.setMasterView(null);+ this.setMasterRendered(false);if (typeof view === 'object') {view.setElement('body');@@ -707,7 +753,7 @@ class Controller {options.fullSelector = 'body';this.viewFactory.create(view, options, view => {- this.set('entire', view);+ this.setEntireView(view);if (!callback) {view.render();diff --git a/client/src/controllers/admin.js b/client/src/controllers/admin.jsindex 0112edf177..efe4cd7469 100644--- a/client/src/controllers/admin.js+++ b/client/src/controllers/admin.js@@ -30,9 +30,18 @@ import Controller from 'controller';import SearchManager from 'search-manager';import SettingsEditView from 'views/settings/edit';import AdminIndexView from 'views/admin/index';+import {inject} from 'di';+import Language from 'language';class AdminController extends Controller {+ /**+ * @private+ * @type {Language}+ */+ @inject(Language)+ language+checkAccessGlobal() {if (this.getUser().isAdmin()) {return true;@@ -444,14 +453,12 @@ class AdminController extends Controller {this.rebuildRunning = true;- const master = this.get('master');-- Espo.Ui.notify(master.translate('pleaseWait', 'messages'));+ Espo.Ui.notify(this.language.translate('pleaseWait', 'messages'));Espo.Ajax.postRequest('Admin/rebuild').then(() => {- const msg = master.translate('Rebuild has been done', 'labels', 'Admin');+ const msg = this.language.translate('Rebuild has been done', 'labels', 'Admin');Espo.Ui.success(msg);@@ -469,13 +476,11 @@ class AdminController extends Controller {this.clearCacheRunning = true;- const master = this.get('master');-- Espo.Ui.notify(master.translate('pleaseWait', 'messages'));+ Espo.Ui.notify(this.language.translate('pleaseWait', 'messages'));Espo.Ajax.postRequest('Admin/clearCache').then(() => {- const msg = master.translate('Cache has been cleared', 'labels', 'Admin');+ const msg = this.language.translate('Cache has been cleared', 'labels', 'Admin');Espo.Ui.success(msg);