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

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

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index a8460603..89cafd5c 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -69,7 +69,7 @@
          "typeAhead" : true,
          "width" : 250,
          "$ xns" : "Roo.form",
-         "name" : "merge_id_name",
+         "name" : "_merge_with_id_name",
          "qtip" : "Select Companies",
          "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 6676a238..c05e0c61 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -154,7 +154,7 @@ Pman.Dialog.CoreEnumMerge = {
           listWidth : 400,
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,
-          name : 'merge_id_name',
+          name : '_merge_with_id_name',
           pageSize : 20,
           qtip : _this._strings['9675747b5ab12d05f18518761e68a533'] /* Select Companies */,
           queryParam : 'query[name]',