X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=blobdiff_plain;f=Pman.Dialog.AdminCompanyMerge.js;h=731987cd830cb636e1f892e9020558cac12157c8;hp=ec8e6275a3e9f1af3da2ea92e438cf0eeebf9cfb;hb=HEAD;hpb=819f7957defbb51fbfeeb2f36972ebb0a7eb8d14

diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index ec8e627..731987c 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -14,6 +14,12 @@ Pman.Dialog.AdminCompanyMerge = {
   '68be4837f6c739877233e527a996dd00' :"Merge",
   'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
+ _named_strings : {
+  '_merge_id_name_emptyText' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
+  '_merge_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+  '_merge_id_name_qtip' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
+  '_merge_id_name_fieldLabel' : '03e956f1dca2b4d525df03cb1899cb6f' /* Merge with */ 
+ },
 
  dialog : false,
  callback:  false,
@@ -117,8 +123,7 @@ Pman.Dialog.AdminCompanyMerge = {
               
               if (action.type == 'setdata') {
                   
-                   var title = _this.data.title  || _this.data.etype;
-                  _this.dialog.setTitle("Delete selected " + title + " and merge data with");
+                  _this.dialog.setTitle("Delete selected " + _this.data.name + " and merge data with");
                    
                  return;
               }
@@ -150,11 +155,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',
@@ -169,10 +174,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,
@@ -180,13 +182,22 @@ Pman.Dialog.AdminCompanyMerge = {
            proxy : {
             xtype : 'HttpProxy',
             method : 'GET',
-            url : baseURL + '/Roo/Core_enum',
+            url : baseURL + '/Roo/Core_company',
             xns : Roo.data,
             '|xns' : 'Roo.data'
            },
            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',
@@ -195,12 +206,6 @@ Pman.Dialog.AdminCompanyMerge = {
            }
           }
          },
-         {
-          xtype : 'Hidden',
-          name : 'etype',
-          xns : Roo.form,
-          '|xns' : 'Roo.form'
-         },
          {
           xtype : 'Hidden',
           name : 'id',