fix customLabel

This commit is contained in:
yuri
2015-01-14 15:34:37 +02:00
parent ca5dfd851d
commit 1d85ac3428
2 changed files with 4 additions and 3 deletions
@@ -7,7 +7,7 @@
{{{pagination}}}
</div>
{{/if}}
{{#if checkboxes}}
{{#if actions}}
<div class="btn-group actions">
@@ -38,7 +38,7 @@
<th {{#if width}} width="{{width}}%"{{/if}}{{#if align}} style="text-align: {{align}};"{{/if}}>
{{#if this.sortable}}
<a href="javascript:" class="sort" data-name="{{this.name}}">
{{#if this.customLabel}}
{{#if this.hasCustomLabel}}
{{this.customLabel}}
{{else}}
{{translate this.name scope=../../../collection.name category='fields'}}
@@ -46,7 +46,7 @@
</a>
{{#if this.sorted}}{{#if this.asc}}<span class="caret"></span>{{else}}<span class="caret-up"></span>{{/if}}{{/if}}
{{else}}
{{#if this.customLabel}}
{{#if this.hasCustomLabel}}
{{this.customLabel}}
{{else}}
{{translate this.name scope=../../../collection.name category='fields'}}
+1
View File
@@ -445,6 +445,7 @@ Espo.define('Views.Record.List', 'View', function (Dep) {
};
if ('customLabel' in this.listLayout[i]) {
item.customLabel = this.listLayout[i].customLabel;
item.hasCustomLabel = true;
}
if (item.sortable) {
item.sorted = this.collection.sortBy === this.listLayout[i].name;