diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json index bb426ef413..bf51b6d764 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json @@ -63,7 +63,8 @@ "options": ["None", "Accepted", "Tentative", "Declined"], "style": { "Accepted": "success", - "Declined": "danger" + "Declined": "danger", + "Tentative": "warning" }, "layoutDetailDisabled": true, "layoutMassUpdateDisabled": true, diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json index 018b7cf555..990e2fe91a 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json @@ -58,7 +58,8 @@ "options": ["None", "Accepted", "Tentative", "Declined"], "style": { "Accepted": "success", - "Declined": "danger" + "Declined": "danger", + "Tentative": "warning" }, "layoutDetailDisabled": true, "layoutMassUpdateDisabled": true, diff --git a/client/src/views/fields/enum.js b/client/src/views/fields/enum.js index 75b5a930b5..94e417a555 100644 --- a/client/src/views/fields/enum.js +++ b/client/src/views/fields/enum.js @@ -56,7 +56,7 @@ Espo.define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], functio } if (this.isReadMode()) { - if (this.params.displayAsLabel) { + if (this.params.displayAsLabel && data.style && data.style !== 'default') { data.class = 'label label-md label'; } else { data.class = 'text'; diff --git a/client/src/views/fields/link-multiple-with-columns.js b/client/src/views/fields/link-multiple-with-columns.js index 0cbb86b50d..4b6a4adbde 100644 --- a/client/src/views/fields/link-multiple-with-columns.js +++ b/client/src/views/fields/link-multiple-with-columns.js @@ -117,11 +117,11 @@ Espo.define('views/fields/link-multiple-with-columns', 'views/fields/link-multip var type = this.columnsDefs[column].type; if (value !== '' && value) { if (type === 'enum') { - roleHtml += ' » ' + + roleHtml += ' » ' + '' + this.getHelper().stripTags(this.getLanguage().translateOption(value, this.columnsDefs[column].field, this.columnsDefs[column].scope)) + ''; } else if (type === 'varchar') { - roleHtml += ' » ' + + roleHtml += ' » ' + '' + value ''; } diff --git a/client/src/views/fields/link-multiple-with-role.js b/client/src/views/fields/link-multiple-with-role.js index 87d648b6cc..9957255db4 100644 --- a/client/src/views/fields/link-multiple-with-role.js +++ b/client/src/views/fields/link-multiple-with-role.js @@ -82,14 +82,16 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple' role = ''; } if (role != '') { - var style = this.getMetadata().get(['entityDefs', this.model.entityType, 'fields', this.roleField, 'style', role]) || 'muted'; + var style = this.getMetadata().get(['entityDefs', this.model.entityType, 'fields', this.roleField, 'style', role]); var className = 'text'; - if (this.displayRoleAsLabel) { + if (this.displayRoleAsLabel && style && style !== 'default') { className = 'label label-sm label'; if (style === 'muted') { style = 'default'; } + } else { + style = style || 'muted'; } roleHtml = ' » ' +