Pman.Dialog.AdminCompanyMerge.bjs

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

diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index ec8e627..05e3441 100644 (file)
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -117,8 +117,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;
               }
@@ -172,7 +171,6 @@ Pman.Dialog.AdminCompanyMerge = {
                  o.params['etype'] = _this.data.etype;
                  
                  o.params['!id'] = _this.form.findField('id').getValue();
-                 // set more here
              }
            },
            xns : Roo.data,
@@ -180,13 +178,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',