From: edward <edward@roojs.com>
Date: Fri, 4 Nov 2016 05:26:46 +0000 (+0800)
Subject: Pman.Dialog.AdminCompanyMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=cbc6d69b9b33dd8dddbd167a03a30fa46a91d345

Pman.Dialog.AdminCompanyMerge.bjs
Pman.Dialog.AdminCompanyMerge.js
---

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index 02dcce0..1942246 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -70,7 +70,7 @@
          "$ xns" : "Roo.form",
          "name" : "_merge_id_name",
          "qtip" : "Select Item to Merge With",
-         "queryParam" : "query[search_begins]",
+         "queryParam" : "search[name]",
          "tpl" : "<div class=\"x-grid-cell-text x-btn button\">{code} - <b>{name}</b> {name}</div>",
          "loadingText" : "Searching...",
          "items" : [
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index b37752e..db73919 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -151,7 +151,7 @@ Pman.Dialog.AdminCompanyMerge = {
           name : '_merge_id_name',
           pageSize : 20,
           qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
-          queryParam : 'query[search_begins]',
+          queryParam : 'search[name]',
           selectOnFocus : true,
           tpl : '<div class=\"x-grid-cell-text x-btn button\">{code} - <b>{name}</b> {name}</div>',
           triggerAction : 'all',