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

---
 Pman.Dialog.CoreEnumMerge.bjs | 8 +++++++-
 Pman.Dialog.CoreEnumMerge.js  | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index e25a30ab..d690d452 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -6,8 +6,9 @@
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
-  "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
+  "8324cdec05065c4bd7d8c5effdf43edf" : "Delete this",
   "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
+  "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
   "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
@@ -56,6 +57,11 @@
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
        "items" : [
+        {
+         "xtype" : "TextField",
+         "String fieldLabel" : "Delete this",
+         "$ xns" : "Roo.form"
+        },
         {
          "alwaysQuery" : true,
          "listWidth" : 400,
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 18d008e5..03192dcf 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,8 +7,9 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
-  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
+  '8324cdec05065c4bd7d8c5effdf43edf' :"Delete this",
   '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
+  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
@@ -144,6 +145,12 @@ Pman.Dialog.CoreEnumMerge = {
         xns : Roo.form,
         '|xns' : 'Roo.form',
         items  : [
+         {
+          xtype : 'TextField',
+          fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          xns : Roo.form,
+          '|xns' : 'Roo.form'
+         },
          {
           xtype : 'ComboBox',
           allowBlank : false,
-- 
2.39.2