From: Alan Knowles <alan@roojs.com>
Date: Fri, 22 Jan 2016 05:35:35 +0000 (+0800)
Subject: Pman.Dialog.CoreEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=b4dd7e00596585f9691d1381e26f9351c4be9285

Pman.Dialog.CoreEnumMerge.bjs
Pman.Dialog.CoreEnumMerge.js
---

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index ab7ca111..100f4eb2 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -71,7 +71,7 @@
          "name" : "_merge_id_name",
          "qtip" : "Select Item to Merge With",
          "queryParam" : "query[name]",
-         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
+         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>",
          "loadingText" : "Searching...",
          "items" : [
           {
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 011007c5..f8205444 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -158,7 +158,7 @@ Pman.Dialog.CoreEnumMerge = {
           qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           queryParam : 'query[name]',
           selectOnFocus : true,
-          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>',
+          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>',
           triggerAction : 'all',
           typeAhead : true,
           valueField : 'id',