EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Held/Not Held action improvement
Yurii0913f58142d4
diff --git a/client/modules/crm/src/views/call/record/detail.js b/client/modules/crm/src/views/call/record/detail.jsindex 212a356e03..1a2796bcbc 100644--- a/client/modules/crm/src/views/call/record/detail.js+++ b/client/modules/crm/src/views/call/record/detail.js@@ -35,24 +35,50 @@ export default class extends DetailRecordView {setupActionItems() {super.setupActionItems();+ if (!this.getAcl().checkModel(this.model, 'edit')) {+ return;+ }++ const historyStatusList = this.getMetadata().get(`scopes.${this.entityType}.historyStatusList`) || [];+if (- this.getAcl().checkModel(this.model, 'edit') &&- this.getAcl().checkField(this.entityType, 'status', 'edit')+ !historyStatusList.includes('Held') ||+ !historyStatusList.includes('Not Held')) {- if (!['Held', 'Not Held'].includes(this.model.attributes.status)) {- this.dropdownItemList.push({- label: 'Set Held',- name: 'setHeld',- onClick: () => this.actionSetHeld(),- });-- this.dropdownItemList.push({- label: 'Set Not Held',- name: 'setNotHeld',- onClick: () => this.actionSetNotHeld(),- });- }+ return;}++ this.dropdownItemList.push({+ 'label': 'Set Held',+ 'name': 'setHeld',+ onClick: () => this.actionSetHeld(),+ });++ this.dropdownItemList.push({+ 'label': 'Set Not Held',+ 'name': 'setNotHeld',+ onClick: () => this.actionSetNotHeld(),+ });++ const control = () => {+ if (+ historyStatusList.includes(this.model.attributes.status) ||+ !this.getAcl().checkModel(this.model, 'edit')+ ) {+ this.hideActionItem('setHeld');+ this.hideActionItem('setNotHeld');+ } else {+ this.showActionItem('setHeld');+ this.showActionItem('setNotHeld');+ }+ };++ control();++ this.model.onSync({+ owner: this,+ callback: () => control(),+ });}manageAccessEdit(second) {@@ -70,9 +96,6 @@ export default class extends DetailRecordView {this.model.save({status: 'Held'}, {patch: true}).then(() => {Espo.Ui.success(this.translate('Saved'));-- this.removeActionItem('setHeld');- this.removeActionItem('setNotHeld');});}@@ -80,9 +103,6 @@ export default class extends DetailRecordView {this.model.save({status: 'Not Held'}, {patch: true}).then(() => {Espo.Ui.success(this.translate('Saved'));-- this.removeActionItem('setHeld');- this.removeActionItem('setNotHeld');});}}diff --git a/client/modules/crm/src/views/meeting/record/detail.js b/client/modules/crm/src/views/meeting/record/detail.jsindex 208ee1774c..51394bda77 100644--- a/client/modules/crm/src/views/meeting/record/detail.js+++ b/client/modules/crm/src/views/meeting/record/detail.js@@ -66,6 +66,26 @@ class MeetingDetailRecordView extends DetailRecordView {'name': 'setNotHeld',onClick: () => this.actionSetNotHeld(),});++ const control = () => {+ if (+ historyStatusList.includes(this.model.attributes.status) ||+ !this.getAcl().checkModel(this.model, 'edit')+ ) {+ this.hideActionItem('setHeld');+ this.hideActionItem('setNotHeld');+ } else {+ this.showActionItem('setHeld');+ this.showActionItem('setNotHeld');+ }+ };++ control();++ this.model.onSync({+ owner: this,+ callback: () => control(),+ });}manageAccessEdit(second) {@@ -81,9 +101,6 @@ class MeetingDetailRecordView extends DetailRecordView {this.model.save({status: 'Held'}, {patch: true}).then(() => {Espo.Ui.success(this.translate('Saved'));-- this.removeActionItem('setHeld');- this.removeActionItem('setNotHeld');});}@@ -91,9 +108,6 @@ class MeetingDetailRecordView extends DetailRecordView {this.model.save({status: 'Not Held'}, {patch: true}).then(() => {Espo.Ui.success(this.translate('Saved'));-- this.removeActionItem('setHeld');- this.removeActionItem('setNotHeld');});}}