DataObjects/Core_domain.php

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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index ecb2fd4..e014b69 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,13 +7,12 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
-  '99b344c8ae43e3e7213862b8f35c4e51' :"Select Company",
+  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
   '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
-  'ea4788705e6873b424c65e91c2846b19' :"Cancel",
-  '9675747b5ab12d05f18518761e68a533' :"Select Companies"
+  'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
 
  dialog : false,
@@ -84,7 +83,7 @@ Pman.Dialog.CoreEnumMerge = {
       listeners : {
        click : function (_self, e)
         {
-            _this.dialog.el.mask("Merging");
+             
             _this.form.doAction("submit");
         
         }
@@ -111,8 +110,7 @@ Pman.Dialog.CoreEnumMerge = {
           
              if (action.type =='submit') {
                  
-                 _this.dialog.el.unmask();
-                 _this.dialog.hide();
+                   _this.dialog.hide();
                  
                   if (_this.callback) {
                      _this.callback.call(_this, _this.form.getValues());
@@ -121,20 +119,17 @@ Pman.Dialog.CoreEnumMerge = {
                   return;
               }
               if (action.type == 'setdata') {
-                  _this.data.table = _this.data.table || 'Companies';
-                  _this.form.findField('table').setValue(_this.data.table);
-                   var title = _this.data.title  || _this.data.comptype;
+                  
+                   var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
-                  _this.form.findField('merge_id').store.proxy.conn.url = baseURL + '/Roo/' + _this.data.table + '.php';
-                  _this.form.findField('merge_id').emptyText = "Select " + title;
-                  _this.form.findField('merge_id').reset();
+                   
                  return;
               }
               
           },
          actionfailed : function (_self, action)
           {
-              _this.dialog.el.unmask();
+           
               Pman.standardActionFailed(_self, action);
           },
          rendered : function (form)
@@ -147,19 +142,19 @@ Pman.Dialog.CoreEnumMerge = {
           allowBlank : false,
           alwaysQuery : true,
           displayField : 'name',
-          emptyText : _this._strings['99b344c8ae43e3e7213862b8f35c4e51'] /* Select Company */,
+          emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
           forceSelection : true,
-          hiddenName : 'merge_id',
+          hiddenName : '_merge_id',
           listWidth : 400,
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,
-          name : 'merge_id_name',
+          name : '_merge_id_name',
           pageSize : 20,
-          qtip : _this._strings['9675747b5ab12d05f18518761e68a533'] /* Select Companies */,
-          queryParam : 'query[name]',
+          qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
+          queryParam : 'query[search_begins]',
           selectOnFocus : true,
-          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>',
+          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>',
           triggerAction : 'all',
           typeAhead : true,
           valueField : 'id',
@@ -177,23 +172,15 @@ Pman.Dialog.CoreEnumMerge = {
             beforeload : function (_self, o){
                  o.params = o.params || {};
                  
-                 if (_this.data.params) {
-                     Roo.apply(o.params, _this.data.params);
-                 }
-                 
-                 o.params.comptype = _this.data.comptype;
-                 o.params['!id'] = _this.data.id;
-                 o.params['table'] = _this.data.table || 'Companies';
-                 if (_this.data.table && _this.data.table == 'Person') {
-                     o.params.company_id = _this.data.company_id;
-                 }
+                 o.params['etype'] = _this.data.etype;
                  
+                 o.params['!id'] = _this.form.findField('id').getValue();
                  // set more here
              }
            },
            proxy : {
             method : 'GET',
-            url : baseURL + '/Roo/Companies.php',
+            url : baseURL + '/Roo/Core_enum',
             xns : Roo.data,
             '|xns' : 'Roo.data',
             xtype : 'HttpProxy'
@@ -210,7 +197,7 @@ Pman.Dialog.CoreEnumMerge = {
           }
          },
          {
-          name : 'table',
+          name : 'etype',
           xns : Roo.form,
           '|xns' : 'Roo.form',
           xtype : 'Hidden'