From ca5dfd851dadfa2769676b6db61484872da8b48b Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Wed, 14 Jan 2015 15:12:37 +0200
Subject: [PATCH] customLabels for list

---
 frontend/client/res/templates/record/list.tpl | 24 +++++++++++++------
 frontend/client/src/views/record/list.js      |  5 +++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/frontend/client/res/templates/record/list.tpl b/frontend/client/res/templates/record/list.tpl
index d8a75eb1e8..7cdbacf220 100644
--- a/frontend/client/res/templates/record/list.tpl
+++ b/frontend/client/res/templates/record/list.tpl
@@ -37,30 +37,40 @@
                 {{#each headerDefs}}
                 <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}}">{{translate this.name scope=../../../collection.name category='fields'}}</a>
-                        {{#if this.sorted}}{{#if this.asc}}<span class="caret"></span>{{else}}<span class="caret-up"></span>{{/if}}{{/if}}                                
+                        <a href="javascript:" class="sort" data-name="{{this.name}}">
+                        {{#if this.customLabel}}
+                            {{this.customLabel}}
+                        {{else}}
+                            {{translate this.name scope=../../../collection.name category='fields'}}
+                        {{/if}}
+                        </a>
+                        {{#if this.sorted}}{{#if this.asc}}<span class="caret"></span>{{else}}<span class="caret-up"></span>{{/if}}{{/if}}
                     {{else}}
-                        {{translate this.name scope=../../../collection.name category='fields'}}
+                        {{#if this.customLabel}}
+                            {{this.customLabel}}
+                        {{else}}
+                            {{translate this.name scope=../../../collection.name category='fields'}}
+                        {{/if}}
                     {{/if}}
                 </th>
                 {{/each}}
             </tr>
         </thead>
-        {{/if}} 
+        {{/if}}
         <tbody>
         {{#each rows}}
-            {{{var this ../this}}} 
+            {{{var this ../this}}}
         {{/each}}
         </tbody>
     </table>
     {{#unless paginationEnabled}}
-    {{#if showMoreEnabled}}    
+    {{#if showMoreEnabled}}
     <div class="show-more{{#unless showMoreActive}} hide{{/unless}}">
         <a type="button" href="javascript:" class="btn btn-default btn-block" data-action="showMore">
             {{#if showCount}}
             <div class="pull-right text-muted more-count">{{moreCount}}</div>
             {{/if}}
-            <span>{{translate 'Show more'}}</span>        
+            <span>{{translate 'Show more'}}</span>
         </a>
     </div>
     {{/if}}
diff --git a/frontend/client/src/views/record/list.js b/frontend/client/src/views/record/list.js
index f388d7d07c..ae525fd613 100644
--- a/frontend/client/src/views/record/list.js
+++ b/frontend/client/src/views/record/list.js
@@ -441,8 +441,11 @@ Espo.define('Views.Record.List', 'View', function (Dep) {
                     name: this.listLayout[i].name,
                     sortable: !(this.listLayout[i].notSortable || false),
                     width: ('width' in this.listLayout[i]) ? this.listLayout[i].width : false,
-                    align: ('align' in this.listLayout[i]) ? this.listLayout[i].align : false
+                    align: ('align' in this.listLayout[i]) ? this.listLayout[i].align : false,
                 };
+                if ('customLabel' in this.listLayout[i]) {
+                    item.customLabel = this.listLayout[i].customLabel;
+                }
                 if (item.sortable) {
                     item.sorted = this.collection.sortBy === this.listLayout[i].name;
                     if (item.sorted) {