From 1d85ac3428cbebb2e8de2be17ec3a1e9c9da7d7a Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Wed, 14 Jan 2015 15:34:37 +0200
Subject: [PATCH] fix customLabel

---
 frontend/client/res/templates/record/list.tpl | 6 +++---
 frontend/client/src/views/record/list.js      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/client/res/templates/record/list.tpl b/frontend/client/res/templates/record/list.tpl
index 7cdbacf220..de63cc8c22 100644
--- a/frontend/client/res/templates/record/list.tpl
+++ b/frontend/client/res/templates/record/list.tpl
@@ -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'}}
diff --git a/frontend/client/src/views/record/list.js b/frontend/client/src/views/record/list.js
index ae525fd613..b2b7162f2b 100644
--- a/frontend/client/src/views/record/list.js
+++ b/frontend/client/src/views/record/list.js
@@ -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;