viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 15:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

enum label changes

Browse Source
This commit is contained in:
yuri
2019-02-15 15:57:36 +02:00
parent d7f5993665
commit 449f0d6237
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
View File

@@ -63,7 +63,8 @@
"options": ["None", "Accepted", "Tentative", "Declined"],
"style": {
"Accepted": "success",
"Declined": "danger"
"Declined": "danger",
"Tentative": "warning"
},
"layoutDetailDisabled": true,
"layoutMassUpdateDisabled": true,

3
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
View File

@@ -58,7 +58,8 @@
"options": ["None", "Accepted", "Tentative", "Declined"],
"style": {
"Accepted": "success",
"Declined": "danger"
"Declined": "danger",
"Tentative": "warning"
},
"layoutDetailDisabled": true,
"layoutMassUpdateDisabled": true,

2
client/src/views/fields/enum.js
View File

@@ -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';

4
client/src/views/fields/link-multiple-with-columns.js
View File

@@ -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 += '<span class="text-muted small"> &#187; ' +
roleHtml += ' <span class="text-muted small">&#187;</span> ' + '<span class="text-muted small">' +
this.getHelper().stripTags(this.getLanguage().translateOption(value, this.columnsDefs[column].field, this.columnsDefs[column].scope)) +
'</span>';
} else if (type === 'varchar') {
roleHtml += '<span class="text-muted small"> &#187; ' +
roleHtml += ' <span class="text-muted small">&#187;</span> ' + '<span class="text-muted small">' +
value
'</span>';
}

6
client/src/views/fields/link-multiple-with-role.js
View File

@@ -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 = '<span class="test-muted small"> &#187; </span>' +