EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
rootUrl changes
Yurii6b0c3bb18a47
diff --git a/client/src/views/detail.js b/client/src/views/detail.jsindex 06bd62e139..7141b2b690 100644--- a/client/src/views/detail.js+++ b/client/src/views/detail.js@@ -148,7 +148,7 @@ class DetailView extends MainView {this.headerView = this.options.headerView || this.headerView;this.recordView = this.options.recordView || this.recordView;- this.rootUrl = this.options.rootUrl || this.options.params.rootUrl || '#' + this.scope;+ this.rootUrl = this.options.rootUrl ?? this.options.params.rootUrl ?? this.rootUrl ?? '#' + this.scope;this.isReturn = this.options.isReturn || this.options.params.isReturn || false;this.nameAttribute = this.getMetadata().get(`clientDefs.${this.entityType}.nameAttribute`) || 'name';@@ -316,9 +316,7 @@ class DetailView extends MainView {const params = this.options.params ?? {};- if (params.rootUrl) {- o.rootUrl = params.rootUrl;- }+ o.rootUrl = this.rootUrl;if (params.rootData) {o.rootData = this.options.params.rootData;diff --git a/client/src/views/edit.js b/client/src/views/edit.jsindex d7587d1053..b4a3ee787a 100644--- a/client/src/views/edit.js+++ b/client/src/views/edit.js@@ -91,7 +91,7 @@ class EditView extends MainView {this.headerView = this.options.headerView || this.headerView;this.recordView = this.options.recordView || this.recordView;- this.rootUrl = this.options.rootUrl || this.options.params.rootUrl || '#' + this.scope;+ this.rootUrl = this.options.rootUrl ?? this.options.params.rootUrl ?? this.rootUrl ?? '#' + this.scope;this.nameAttribute = this.getMetadata().get(`clientDefs.${this.entityType}.nameAttribute`) || 'name';@@ -136,9 +136,7 @@ class EditView extends MainView {const params = this.options.params || {};- if (params.rootUrl) {- o.rootUrl = params.rootUrl;- }+ o.rootUrl = this.rootUrl;if (params.rootData) {o.rootData = params.rootData;diff --git a/client/src/views/main.js b/client/src/views/main.jsindex 1a7f3966da..19eac543a6 100644--- a/client/src/views/main.js+++ b/client/src/views/main.js@@ -683,7 +683,9 @@ class MainView extends View {this.getRouter().checkConfirmLeaveOut(() => {const rootUrl = this.rootUrl ??- (this.options.rootUrl || this.options.params.rootUrl || '#' + this.scope);+ this.options.rootUrl ??+ this.options.params.rootUrl ??+ '#' + this.scope;this.getRouter().navigate(rootUrl, {trigger: true, isReturn: true});});diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.jsindex 21b8c130a1..63387b280a 100644--- a/client/src/views/record/detail.js+++ b/client/src/views/record/detail.js@@ -3526,16 +3526,14 @@ class DetailRecordView extends BaseRecordView {url = this.returnUrl;} else {if (after === 'delete') {- url = this.options.rootUrl;+ url = this.options.rootUrl ?? `#${this.scope}`;- if (url) {+ if (url !== `#${this.scope}`) {this.getRouter().navigate(url, {trigger: true});return;}- url = '#' + this.scope;-this.getRouter().navigate(url, {trigger: false});this.getRouter().dispatch(this.scope, null, {isReturn: true});@@ -3560,7 +3558,7 @@ class DetailRecordView extends BaseRecordView {this.getRouter().dispatch(this.scope, 'view', options);}} else {- url = this.options.rootUrl || '#' + this.scope;+ url = this.options.rootUrl ?? '#' + this.scope;}}