X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.bjs;h=f9c58b2b9110ef8b65bbf879b7a9b600f4cff033;hp=2dea58ba4fe5d0ae2da3c09d19660e0f88b612ef;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hpb=0941314e8de75ab8c0d8cda7a3824edfc605e688

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 2dea58ba..f9c58b2b 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -2,17 +2,17 @@
  "name" : "Pman.Dialog.CoreEnumMerge",
  "parent" : "",
  "title" : "",
- "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
+ "path" : "/home/benny/gitlive/web.hhyc_membership_system/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
-  "99b344c8ae43e3e7213862b8f35c4e51" : "Select Company",
-  "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
+  "8324cdec05065c4bd7d8c5effdf43edf" : "Delete this",
+  "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
+  "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
-  "ea4788705e6873b424c65e91c2846b19" : "Cancel",
-  "e26f3a67ad6487fd02ffcab189214302" : "Merge Supplier",
-  "9675747b5ab12d05f18518761e68a533" : "Select Companies"
+  "266459bee8ed1ca2e0464899e1ef0994" : "And replace with",
+  "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
  "items" : [
   {
@@ -21,13 +21,13 @@
    },
    "modal" : true,
    "collapsible" : false,
-   "title" : "Merge Supplier",
+   "title" : "Merge Pulldown Option",
    "xtype" : "LayoutDialog",
-   "width" : 400,
+   "width" : 450,
    "$ xns" : "Roo",
    "closable" : false,
    "resizable" : false,
-   "height" : 120,
+   "height" : 160,
    "items" : [
     {
      "xtype" : "LayoutRegion",
@@ -41,27 +41,36 @@
      "items" : [
       {
        "listeners" : {
-        "actionfailed" : "function (_self, action)\n{\n    _this.dialog.el.unmask();\n    Pman.standardActionFailed(_self, action);\n}\n",
-        "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n       _this.dialog.el.unmask();\n       _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        _this.data.table = _this.data.table || 'Companies';\n        _this.form.findField('table').setValue(_this.data.table);\n         var title = _this.data.title  || _this.data.comptype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n        _this.form.findField('merge_id').store.proxy.conn.url = baseURL + '/Roo/' + _this.data.table + '.php';\n        _this.form.findField('merge_id').emptyText = \"Select \" + title;\n        _this.form.findField('merge_id').reset();\n       return;\n    }\n    \n}\n",
+        "actionfailed" : "function (_self, action)\n{\n \n    Pman.standardActionFailed(_self, action);\n}\n",
+        "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n         _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        \n         var title = _this.data.title  || _this.data.etype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n        \n\n        if(typeof(_this.data._ids) == \"undefined\"){\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n            return;\n        }\n        _this.form.findField('_names').setValue(_this.data._names);\n        _this.form.findField('_ids').setValue(_this.data._ids);\n        return;\n    }\n    \n}\n",
         "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
-       "$ url" : "baseURL + '/Shipping/CompanyMerge.php'",
+       "$ url" : "baseURL + '/Roo/Core_enum.php'",
        "method" : "POST",
        "xtype" : "Form",
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
+       "Number labelWidth" : 120,
        "items" : [
+        {
+         "String name" : "_names",
+         "Number width" : 250,
+         "Boolean readOnly" : true,
+         "xtype" : "TextField",
+         "String fieldLabel" : "Delete this",
+         "$ xns" : "Roo.form"
+        },
         {
          "alwaysQuery" : true,
          "listWidth" : 400,
          "triggerAction" : "all",
-         "fieldLabel" : "Merge with",
+         "fieldLabel" : "And replace with",
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,
          "displayField" : "name",
-         "emptyText" : "Select Company",
-         "hiddenName" : "merge_id",
+         "emptyText" : "Select Item to Merge With",
+         "hiddenName" : "_merge_id",
          "minChars" : 2,
          "valueField" : "id",
          "xtype" : "ComboBox",
@@ -69,15 +78,15 @@
          "typeAhead" : true,
          "width" : 250,
          "$ xns" : "Roo.form",
-         "name" : "merge_id_name",
-         "qtip" : "Select Companies",
-         "queryParam" : "query[name]",
-         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
+         "name" : "_merge_id_name",
+         "qtip" : "Select Item to Merge With",
+         "queryParam" : "query[search_begins]",
+         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>",
          "loadingText" : "Searching...",
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    if (_this.data.params) {\n        Roo.apply(o.params, _this.data.params);\n    }\n    \n    o.params.comptype = _this.data.comptype;\n    o.params['!id'] = _this.data.id;\n    o.params['table'] = _this.data.table || 'Companies';\n    if (_this.data.table && _this.data.table == 'Person') {\n        o.params.company_id = _this.data.company_id;\n    }\n    \n    // set more here\n}\n"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params['etype'] = _this.data.etype;\n    \n    o.params['!id'] = _this.form.findField('id').getValue();\n    // set more here\n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
@@ -86,7 +95,7 @@
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Companies.php'",
+             "$ url" : "baseURL + '/Roo/Core_enum'",
              "xtype" : "HttpProxy",
              "method" : "GET",
              "$ xns" : "Roo.data",
@@ -108,7 +117,12 @@
         {
          "xtype" : "Hidden",
          "$ xns" : "Roo.form",
-         "name" : "table"
+         "name" : "etype"
+        },
+        {
+         "xtype" : "Hidden",
+         "$ xns" : "Roo.form",
+         "name" : "_ids"
         },
         {
          "xtype" : "Hidden",
@@ -130,7 +144,7 @@
     },
     {
      "listeners" : {
-      "click" : "function (_self, e)\n{\n    _this.dialog.el.mask(\"Merging\");\n    _this.form.doAction(\"submit\");\n\n}"
+      "click" : "function (_self, e)\n{\n     \n    _this.form.doAction(\"submit\");\n\n}"
      },
      "text" : "Merge",
      "xtype" : "Button",