Pman.Dialog.AdminCompanyMerge.bjs

[Pman.Admin] / Pman.Dialog.AdminCompanyMerge.js

diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index 8f8336b..321d75b 100644 (file)
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -149,11 +149,11 @@ Pman.Dialog.AdminCompanyMerge = {
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,
           name : '_merge_id_name',
-          pageSize : 20,
+          pageSize : 25,
           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\"><b>{display_name}</b> {name}</div>',
+          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b></div>',
           triggerAction : 'all',
           typeAhead : true,
           valueField : 'id',
@@ -168,10 +168,7 @@ Pman.Dialog.AdminCompanyMerge = {
             beforeload : function (_self, o){
                  o.params = o.params || {};
                  
-                 o.params['etype'] = _this.data.etype;
-                 
                  o.params['!id'] = _this.form.findField('id').getValue();
-                 // set more here
              }
            },
            xns : Roo.data,
@@ -185,7 +182,16 @@ Pman.Dialog.AdminCompanyMerge = {
            },
            reader : {
             xtype : 'JsonReader',
-            fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}],
+            fields : [
+                {
+                    "name":"id",
+                    "type":"int"
+                },
+                {
+                    "name":"name",
+                    "type":"string"
+                }
+            ],
             id : 'id',
             root : 'data',
             totalProperty : 'total',
@@ -194,12 +200,6 @@ Pman.Dialog.AdminCompanyMerge = {
            }
           }
          },
-         {
-          xtype : 'Hidden',
-          name : 'etype',
-          xns : Roo.form,
-          '|xns' : 'Roo.form'
-         },
          {
           xtype : 'Hidden',
           name : 'id',