From aed3ccd7005b39b16c6155547182111e991dbac9 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 22 Jan 2016 13:35:16 +0800
Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js

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

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 0e172433..ab7ca111 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -60,7 +60,7 @@
          "pageSize" : 20,
          "displayField" : "name",
          "emptyText" : "Select Item to Merge With",
-         "hiddenName" : "_merge_with_id",
+         "hiddenName" : "_merge_id",
          "minChars" : 2,
          "valueField" : "id",
          "xtype" : "ComboBox",
@@ -68,7 +68,7 @@
          "typeAhead" : true,
          "width" : 250,
          "$ xns" : "Roo.form",
-         "name" : "_merge_with_id_name",
+         "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>",
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index a39210ba..011007c5 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -149,11 +149,11 @@ Pman.Dialog.CoreEnumMerge = {
           emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
           forceSelection : true,
-          hiddenName : '_merge_with_id',
+          hiddenName : '_merge_id',
           listWidth : 400,
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,
-          name : '_merge_with_id_name',
+          name : '_merge_id_name',
           pageSize : 20,
           qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           queryParam : 'query[name]',
-- 
2.39.2