Pman.Dialog.AdminCompanyMerge.bjs

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

diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index 95e8d38..cc7ba06 100644 (file)
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -8,7 +8,7 @@ Pman.Dialog.AdminCompanyMerge = {
 
  _strings : {
   'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
-  '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
+  'd928853fb4dfe148595cef31a72d52f5' :"Merge Company",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
@@ -45,14 +45,12 @@ Pman.Dialog.AdminCompanyMerge = {
     height : 120,
     modal : true,
     resizable : false,
-    title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
+    title : _this._strings['d928853fb4dfe148595cef31a72d52f5'] /* Merge Company */,
     width : 400,
     listeners : {
      show : function (_self)
       {
-          if (_this.isBuilder) {
-              _this.data = { id : 2, comptype : 'SUPPLIER' }
-          }
+          
       }
     },
     xns : Roo,
@@ -101,7 +99,7 @@ Pman.Dialog.AdminCompanyMerge = {
         xtype : 'Form',
         method : 'POST',
         style : 'margin: 10px;',
-        url : baseURL + '/Roo/Core_enum.php',
+        url : baseURL + '/Roo/Core_company.php',
         listeners : {
          actioncomplete : function (_self, action)
           {
@@ -116,10 +114,10 @@ Pman.Dialog.AdminCompanyMerge = {
                   _this.form.reset();
                   return;
               }
+              
               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;
               }
@@ -170,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,
@@ -181,13 +176,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',