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

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

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index 6201a6f..ef8f8f4 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -57,7 +57,7 @@
          "fieldLabel" : "Merge with",
          "forceSelection" : true,
          "selectOnFocus" : true,
-         "pageSize" : 25,
+         "pageSize" : 20,
          "displayField" : "name",
          "emptyText" : "Select Item to Merge With",
          "hiddenName" : "_merge_id",
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index 321d75b..a6f19b8 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -149,7 +149,7 @@ Pman.Dialog.AdminCompanyMerge = {
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,
           name : '_merge_id_name',
-          pageSize : 25,
+          pageSize : 20,
           qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           queryParam : 'search[name]',
           selectOnFocus : true,