EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
list view get select attributes ref
Yuri Kuznetsov078674b85bcb
diff --git a/client/src/views/list.js b/client/src/views/list.jsindex d16a036e8b..3a94b8e315 100644--- a/client/src/views/list.js+++ b/client/src/views/list.js@@ -666,7 +666,7 @@ class ListView extends MainView {const listViewName = this.getRecordViewName();// noinspection JSValidateTypes- return this.createView('list', listViewName, o, /** import('views/record/list').default */view => {+ return this.createView('list', listViewName, o, async /** import('views/record/list').default */view => {if (!this.hasParentView()) {view.undelegateEvents();@@ -685,35 +685,36 @@ class ListView extends MainView {});if (!fetch) {- Espo.Ui.notify(false);+ Espo.Ui.notify();}if (this.searchPanel) {- this.listenTo(view, 'sort', obj => {- this.getStorage().set('listSorting', this.collection.entityType, obj);+ this.listenTo(view, 'sort', o => {+ this.getStorage().set('listSorting', this.collection.entityType, o);});}if (!fetch) {- view.render();+ await view.render();return;}- view.getSelectAttributeList(selectAttributeList => {- if (this.options.mediator && this.options.mediator.abort) {- return;- }+ const selectAttributes = await view.getSelectAttributeList();- if (selectAttributeList) {- this.collection.data.select = selectAttributeList.join(',');- }+ if (this.options.mediator && this.options.mediator.abort) {+ return;+ }- Espo.Ui.notifyWait();+ if (selectAttributes) {+ this.collection.data.select = selectAttributes.join(',');+ }- this.collection.fetch({main: true})- .then(() => Espo.Ui.notify(false));- });+ Espo.Ui.notifyWait();++ await this.collection.fetch({main: true});++ Espo.Ui.notify();});}diff --git a/client/src/views/record/kanban.js b/client/src/views/record/kanban.jsindex 8f40ee2975..7989651cd5 100644--- a/client/src/views/record/kanban.js+++ b/client/src/views/record/kanban.js@@ -845,16 +845,23 @@ class KanbanRecordView extends ListRecordView {});}- getSelectAttributeList(callback) {- super.getSelectAttributeList(attributeList => {- if (attributeList) {- if (!~attributeList.indexOf(this.statusField)) {- attributeList.push(this.statusField);- }- }+ async getSelectAttributeList(callback) {+ const attributeList = await super.getSelectAttributeList();+ if (!attributeList) {+ return null;+ }++ if (!attributeList.includes(this.statusField)) {+ attributeList.push(this.statusField);+ }++ if (callback) {+ // For bc.callback(attributeList);- });+ }++ return attributeList;}buildRows(callback) {diff --git a/client/src/views/record/list.js b/client/src/views/record/list.jsindex c8cc0dd218..1209d1f39a 100644--- a/client/src/views/record/list.js+++ b/client/src/views/record/list.js@@ -2597,15 +2597,16 @@ class ListRecordView extends View {/*** Get a select-attribute list.*- * @param {function(string[]):void} callback A callback.- *- * @todo Return promise. But support callback for bc.+ * @param {function(string[]): void} [callback] A callback. For bc.+ * @return {Promise<string[]|null>}*/- getSelectAttributeList(callback) {+ async getSelectAttributeList(callback) {+ callback ??= () => {};+if (this.scope === null) {callback(null);- return;+ return null;}if (this.listLayout) {@@ -2613,20 +2614,26 @@ class ListRecordView extends View {callback(attributeList);- return;+ return attributeList;}- this._loadListLayout(listLayout => {- this.listLayout = listLayout;+ return await (+ new Promise(resolve => {+ this._loadListLayout(listLayout => {+ this.listLayout = listLayout;- let attributeList = this.fetchAttributeListFromLayout();+ let attributeList = this.fetchAttributeListFromLayout();- if (this.mandatorySelectAttributeList) {- attributeList = attributeList.concat(this.mandatorySelectAttributeList);- }+ if (this.mandatorySelectAttributeList) {+ attributeList = attributeList.concat(this.mandatorySelectAttributeList);+ }- callback(attributeList);- });+ callback(attributeList);++ resolve(attributeList);+ });+ })+ );}/**