Pman.Dialog.CoreEnumMerge.bjs

[Pman.Core] / Pman.Dialog.CoreEnumMerge.js

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 66b30f5..0402020 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -83,7 +83,7 @@ Pman.Dialog.CoreEnumMerge = {
       listeners : {
        click : function (_self, e)
         {
-            _this.dialog.el.mask("Merging");
+             
             _this.form.doAction("submit");
         
         }
@@ -156,7 +156,7 @@ Pman.Dialog.CoreEnumMerge = {
           name : '_merge_id_name',
           pageSize : 20,
           qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
-          queryParam : 'query[name]',
+          queryParam : 'query[search_begins]',
           selectOnFocus : true,
           tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>',
           triggerAction : 'all',
@@ -184,7 +184,7 @@ Pman.Dialog.CoreEnumMerge = {
            },
            proxy : {
             method : 'GET',
-            url : baseURL + '/Roo/Companies.php',
+            url : baseURL + '/Roo/Core_enum',
             xns : Roo.data,
             '|xns' : 'Roo.data',
             xtype : 'HttpProxy'