X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=3e8d8415f8b6fc4ec5b24145436f137ce0a45f1a;hp=011007c584c9ff06b380c005ba45d33f5847a8ca;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=aed3ccd7005b39b16c6155547182111e991dbac9

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 011007c5..3e8d8415 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,13 +7,21 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
-  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
+  '8324cdec05065c4bd7d8c5effdf43edf' :"Delete this",
   '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
-  '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
+  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
+  '266459bee8ed1ca2e0464899e1ef0994' :"And replace with",
   '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' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ ,
+  '_names_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ 
+ },
 
  dialog : false,
  callback:  false,
@@ -39,16 +47,14 @@ Pman.Dialog.CoreEnumMerge = {
  {
    var _this = this;
    this.dialog = Roo.factory({
+    xtype : 'LayoutDialog',
     closable : false,
     collapsible : false,
-    height : 120,
+    height : 160,
     modal : true,
     resizable : false,
     title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
-    width : 400,
-    xns : Roo,
-    '|xns' : 'Roo',
-    xtype : 'LayoutDialog',
+    width : 450,
     listeners : {
      show : function (_self)
       {
@@ -57,61 +63,61 @@ Pman.Dialog.CoreEnumMerge = {
           }
       }
     },
+    xns : Roo,
+    '|xns' : 'Roo',
     center : {
+     xtype : 'LayoutRegion',
      xns : Roo,
-     '|xns' : 'Roo',
-     xtype : 'LayoutRegion'
+     '|xns' : 'Roo'
     },
     buttons : [
      {
-      text : _this._strings['ea4788705e6873b424c65e91c2846b19'] /* Cancel */,
-      xns : Roo,
-      '|xns' : 'Roo',
       xtype : 'Button',
+      text : _this._strings['ea4788705e6873b424c65e91c2846b19'] /* Cancel */,
       listeners : {
        click : function (_self, e)
         {
             _this.dialog.hide();
         }
-      }
+      },
+      xns : Roo,
+      '|xns' : 'Roo'
      },
      {
-      text : _this._strings['68be4837f6c739877233e527a996dd00'] /* Merge */,
-      xns : Roo,
-      '|xns' : 'Roo',
       xtype : 'Button',
+      text : _this._strings['68be4837f6c739877233e527a996dd00'] /* Merge */,
       listeners : {
        click : function (_self, e)
         {
-            _this.dialog.el.mask("Merging");
+             
             _this.form.doAction("submit");
         
         }
-      }
+      },
+      xns : Roo,
+      '|xns' : 'Roo'
      }
     ],
     items  : [
      {
+      xtype : 'ContentPanel',
       region : 'center',
       xns : Roo,
       '|xns' : 'Roo',
-      xtype : 'ContentPanel',
       items  : [
        {
+        xtype : 'Form',
+        labelWidth : 120,
         method : 'POST',
         style : 'margin: 10px;',
         url : baseURL + '/Roo/Core_enum.php',
-        xns : Roo.form,
-        '|xns' : 'Roo.form',
-        xtype : 'Form',
         listeners : {
          actioncomplete : function (_self, action)
           {
           
              if (action.type =='submit') {
                  
-                 _this.dialog.el.unmask();
-                 _this.dialog.hide();
+                   _this.dialog.hide();
                  
                   if (_this.callback) {
                      _this.callback.call(_this, _this.form.getValues());
@@ -120,20 +126,24 @@ 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;
+                  
+          
+                  if(typeof(_this.data._ids) == "undefined"){
+                      this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                      return;
+                  }
+                  _this.form.findField('_names').setValue(_this.data._names);
+                  _this.form.findField('_ids').setValue(_this.data._ids);
+                  return;
               }
               
           },
          actionfailed : function (_self, action)
           {
-              _this.dialog.el.unmask();
+           
               Pman.standardActionFailed(_self, action);
           },
          rendered : function (form)
@@ -141,13 +151,25 @@ Pman.Dialog.CoreEnumMerge = {
              _this.form = form;
           }
         },
+        xns : Roo.form,
+        '|xns' : 'Roo.form',
         items  : [
          {
+          xtype : 'TextField',
+          fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          name : '_names',
+          readOnly : true,
+          width : 250,
+          xns : Roo.form,
+          '|xns' : 'Roo.form'
+         },
+         {
+          xtype : 'ComboBox',
           allowBlank : false,
           alwaysQuery : true,
           displayField : 'name',
           emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
-          fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
+          fieldLabel : _this._strings['266459bee8ed1ca2e0464899e1ef0994'] /* And replace with */,
           forceSelection : true,
           hiddenName : '_merge_id',
           listWidth : 400,
@@ -156,69 +178,66 @@ 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>{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',
           width : 250,
           xns : Roo.form,
           '|xns' : 'Roo.form',
-          xtype : 'ComboBox',
           store : {
+           xtype : 'Store',
            remoteSort : true,
            sortInfo : { direction : 'ASC', field: 'name' },
-           xns : Roo.data,
-           '|xns' : 'Roo.data',
-           xtype : 'Store',
            listeners : {
             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
              }
            },
+           xns : Roo.data,
+           '|xns' : 'Roo.data',
            proxy : {
+            xtype : 'HttpProxy',
             method : 'GET',
-            url : baseURL + '/Roo/Companies.php',
+            url : baseURL + '/Roo/Core_enum',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'HttpProxy'
+            '|xns' : 'Roo.data'
            },
            reader : {
+            xtype : 'JsonReader',
             fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}],
             id : 'id',
             root : 'data',
             totalProperty : 'total',
             xns : Roo.data,
-            '|xns' : 'Roo.data',
-            xtype : 'JsonReader'
+            '|xns' : 'Roo.data'
            }
           }
          },
          {
-          name : 'table',
+          xtype : 'Hidden',
+          name : 'etype',
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
+         },
+         {
+          xtype : 'Hidden',
+          name : '_ids',
+          xns : Roo.form,
+          '|xns' : 'Roo.form'
          },
          {
+          xtype : 'Hidden',
           name : 'id',
           xns : Roo.form,
-          '|xns' : 'Roo.form',
-          xtype : 'Hidden'
+          '|xns' : 'Roo.form'
          }
         ]
        }