EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
select related create fix
Yuri Kuznetsov5c7467e4bf22
diff --git a/client/src/helpers/record/select-related.js b/client/src/helpers/record/select-related.jsindex d34c0e33d5..c9e4b3baae 100644--- a/client/src/helpers/record/select-related.js+++ b/client/src/helpers/record/select-related.js@@ -58,6 +58,8 @@ class SelectRelatedHelper {* primaryFilterName?: string,* boolFilterList?: string[]|string,* viewKey?: string,+ * hasCreate?: boolean,+ * onCreate?: function(): void,* }} options*/process(model, link, options = {}) {@@ -159,10 +161,14 @@ class SelectRelatedHelper {const orderBy = filters.orderBy || panelDefs.selectOrderBy;const orderDirection = filters.orderBy ? filters.order : panelDefs.selectOrderDirection;+ const createButton = options.hasCreate === true && options.onCreate !== undefined;++ /** @type {import('views/modals/select-records').default} */+ let modalView;+this.view.createView('dialogSelectRelated', viewName, {scope: scope,multiple: true,- triggerCreateEvent: true,filters: advanced,massRelateEnabled: massRelateEnabled,primaryFilterName: primaryFilterName,@@ -171,7 +177,17 @@ class SelectRelatedHelper {layoutName: panelDefs.selectLayout,orderBy: orderBy,orderDirection: orderDirection,+ createButton: createButton,+ onCreate: () => {+ modalView.close();++ if (options.onCreate) {+ options.onCreate();+ }+ },}, view => {+ modalView = view;+view.render();Espo.Ui.notify(false);diff --git a/client/src/views/modals/select-records.js b/client/src/views/modals/select-records.jsindex ba17fda9e7..7cb1d8c919 100644--- a/client/src/views/modals/select-records.js+++ b/client/src/views/modals/select-records.js@@ -100,6 +100,7 @@ class SelectRecordsModalView extends ModalView {* @property {function(): Promise<Record>} [createAttributesProvider] Create-attributes provider.* @property {Record} [createAttributes] Create-attributes.* @property {function(import('model').default[])} [onSelect] On record select. As of 9.0.0.+ * @property {function(import('model').default[])} [onCreate] On create click. As of 9.0.5.*//**@@ -113,6 +114,11 @@ class SelectRecordsModalView extends ModalView {/** @private */this.onSelect = options.onSelect;}++ if (options.onCreate) {+ /** @private */+ this.onCreate = options.onCreate;+ }}data() {@@ -388,6 +394,13 @@ class SelectRecordsModalView extends ModalView {}create() {+ if (this.onCreate) {+ this.onCreate();++ return;+ }++ // @todo Remove in v9.1.0. Kept bc.if (this.options.triggerCreateEvent) {this.trigger('create');diff --git a/client/src/views/record/panels/relationship.js b/client/src/views/record/panels/relationship.jsindex 087a9dce1a..56f60a2664 100644--- a/client/src/views/record/panels/relationship.js+++ b/client/src/views/record/panels/relationship.js@@ -885,7 +885,10 @@ class RelationshipPanelView extends BottomPanelView {actionSelectRelated() {const helper = new SelectRelatedHelper(this);- helper.process(this.model, this.link);+ helper.process(this.model, this.link, {+ hasCreate: this.defs.create,+ onCreate: () => this.actionCreateRelated(),+ });}/**