Skip to content

EspoCRM – Open Source CRM Application

my {EntityType} dashlets order by

Yurii5d6492b1d0f5
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
index 20da8a0db1..679f37eade 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
@@ -20,6 +20,16 @@
"expandedLayout": {
"type": "base",
"view": "views/dashlets/fields/records/expanded-layout"
+ },
+ "orderBy": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-by"
+ },
+ "order": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-direction",
+ "options": ["asc", "desc"],
+ "translation": "DashletOptions.options.sortDirection"
}
},
"defaults": {
@@ -87,6 +97,16 @@
{"name": "displayRecords"},
false
],
+ [
+ {
+ "name": "orderBy",
+ "labelTranslation": "DashletOptions.fields.sortBy"
+ },
+ {
+ "name": "order",
+ "labelTranslation": "DashletOptions.fields.sortDirection"
+ }
+ ],
[
{"name": "expandedLayout"},
false
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
index 9f71870288..3d6eac7164 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
@@ -24,6 +24,16 @@
},
"includeShared": {
"type": "bool"
+ },
+ "orderBy": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-by"
+ },
+ "order": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-direction",
+ "options": ["asc", "desc"],
+ "translation": "DashletOptions.options.sortDirection"
}
},
"defaults": {
@@ -78,6 +88,16 @@
{"name": "displayRecords"},
{"name": "includeShared"}
],
+ [
+ {
+ "name": "orderBy",
+ "labelTranslation": "DashletOptions.fields.sortBy"
+ },
+ {
+ "name": "order",
+ "labelTranslation": "DashletOptions.fields.sortDirection"
+ }
+ ],
[
{"name": "expandedLayout"},
false
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
index f4e8f11c60..b146cfcfbc 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
@@ -24,6 +24,16 @@
},
"includeShared": {
"type": "bool"
+ },
+ "orderBy": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-by"
+ },
+ "order": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-direction",
+ "options": ["asc", "desc"],
+ "translation": "DashletOptions.options.sortDirection"
}
},
"defaults": {
@@ -72,6 +82,16 @@
{"name": "displayRecords"},
{"name": "includeShared"}
],
+ [
+ {
+ "name": "orderBy",
+ "labelTranslation": "DashletOptions.fields.sortBy"
+ },
+ {
+ "name": "order",
+ "labelTranslation": "DashletOptions.fields.sortDirection"
+ }
+ ],
[
{"name": "expandedLayout"},
false
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
index fc718a9d66..a4ae389a0a 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
@@ -20,6 +20,16 @@
"expandedLayout": {
"type": "base",
"view": "views/dashlets/fields/records/expanded-layout"
+ },
+ "orderBy": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-by"
+ },
+ "order": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-direction",
+ "options": ["asc", "desc"],
+ "translation": "DashletOptions.options.sortDirection"
}
},
"defaults": {
@@ -81,6 +91,16 @@
{"name": "displayRecords"},
false
],
+ [
+ {
+ "name": "orderBy",
+ "labelTranslation": "DashletOptions.fields.sortBy"
+ },
+ {
+ "name": "order",
+ "labelTranslation": "DashletOptions.fields.sortDirection"
+ }
+ ],
[
{"name": "expandedLayout"},
false
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
index 6c9cdc2f8f..2505c611e3 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
@@ -24,6 +24,16 @@
},
"includeShared": {
"type": "bool"
+ },
+ "orderBy": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-by"
+ },
+ "order": {
+ "type": "enum",
+ "view": "views/dashlets/fields/records/sort-direction",
+ "options": ["asc", "desc"],
+ "translation": "DashletOptions.options.sortDirection"
}
},
"defaults": {
@@ -75,6 +85,16 @@
{"name": "displayRecords"},
{"name": "includeShared"}
],
+ [
+ {
+ "name": "orderBy",
+ "labelTranslation": "DashletOptions.fields.sortBy"
+ },
+ {
+ "name": "order",
+ "labelTranslation": "DashletOptions.fields.sortDirection"
+ }
+ ],
[
{"name": "expandedLayout"},
false
diff --git a/client/src/views/dashlets/fields/records/sort-by.js b/client/src/views/dashlets/fields/records/sort-by.js
index 2e16c8ac14..8d8be56500 100644
--- a/client/src/views/dashlets/fields/records/sort-by.js
+++ b/client/src/views/dashlets/fields/records/sort-by.js
@@ -40,7 +40,9 @@ export default class extends EnumFieldView {
}
setupOptions() {
- const entityType = this.model.get('entityType');
+ const entityType = this.model.attributes.entityType ??
+ this.getMetadata().get(['dashlets', this.dataObject.dashletName, 'entityType']);
+
const scope = entityType;
if (!entityType) {