From 33a318dc882d236dcc138b9dd64078e64c875d34 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Thu, 30 Aug 2018 15:06:51 +0800
Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js

---
 Pman.Dialog.CoreEnumMerge.bjs | 3 +++
 Pman.Dialog.CoreEnumMerge.js  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index f9488dad..12f3119c 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -15,6 +15,7 @@
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
  "named_strings" : {
+  "display_name_fieldLabel" : "8324cdec05065c4bd7d8c5effdf43edf",
   "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
   "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
   "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
@@ -59,7 +60,9 @@
        "Number labelWidth" : 120,
        "items" : [
         {
+         "String name" : "display_name",
          "Number width" : 250,
+         "Boolean readOnly" : true,
          "xtype" : "TextField",
          "String fieldLabel" : "Delete this",
          "$ xns" : "Roo.form"
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 1555ae7a..0c0b6495 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -16,6 +16,7 @@ Pman.Dialog.CoreEnumMerge = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
  _named_strings : {
+  'display_name_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ ,
   '_merge_id_name_emptyText' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
   '_merge_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
   '_merge_id_name_qtip' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
@@ -149,6 +150,8 @@ Pman.Dialog.CoreEnumMerge = {
          {
           xtype : 'TextField',
           fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          name : 'display_name',
+          readOnly : true,
           width : 250,
           xns : Roo.form,
           '|xns' : 'Roo.form'
-- 
2.39.2