X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=blobdiff_plain;f=Pman.Dialog.AdminCompanyMerge.bjs;h=d3364fa3c50cb9f81106781dafb22ec79001c0d9;hp=b8719c44168f3122195c9af66c166a0a5a3594e7;hb=HEAD;hpb=8681d21301d601f2b0fda20a1ca67227be7a4e00

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index b8719c4..d3364fa 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.AdminCompanyMerge",
  "parent" : "",
  "title" : "",
- "path" : "/home/edward/gitlive/Pman.Admin/Pman.Dialog.AdminCompanyMerge.bjs",
+ "path" : "/home/benny/gitlive/web.hhyc_membership_system/Pman.Admin/Pman.Dialog.AdminCompanyMerge.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -41,12 +41,12 @@
       {
        "listeners" : {
         "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    \n    if (action.type == 'setdata') {\n        \n        _this.dialog.setTitle(\"Delete selected \" + _this.data.name + \" and merge data with\");\n         \n       return;\n    }\n    \n}\n",
-        "rendered" : "function (form)\n{\n   _this.form = form;\n}"
+        "rendered" : "function (form)\n{\n   _this.form = form;\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    \n    if (action.type == 'setdata') {\n        \n        _this.dialog.setTitle(\"Delete selected \" + _this.data.name + \" and merge data with\");\n         \n       return;\n    }\n    \n}\n"
        },
        "$ url" : "baseURL + '/Roo/Core_company.php'",
-       "method" : "POST",
        "xtype" : "Form",
+       "method" : "POST",
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
        "items" : [
@@ -57,7 +57,7 @@
          "fieldLabel" : "Merge with",
          "forceSelection" : true,
          "selectOnFocus" : true,
-         "pageSize" : 20,
+         "pageSize" : 25,
          "displayField" : "name",
          "emptyText" : "Select Item to Merge With",
          "hiddenName" : "_merge_id",
@@ -70,13 +70,13 @@
          "$ xns" : "Roo.form",
          "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>",
+         "queryParam" : "search[name]",
+         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b></div>",
          "loadingText" : "Searching...",
          "items" : [
           {
            "listeners" : {
-            "|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"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params['!id'] = _this.form.findField('id').getValue();\n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
@@ -85,9 +85,9 @@
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Core_enum'",
-             "xtype" : "HttpProxy",
+             "$ url" : "baseURL + '/Roo/Core_company'",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -95,7 +95,7 @@
              "id" : "id",
              "root" : "data",
              "xtype" : "JsonReader",
-             "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]",
+             "$ fields" : "[\n    {\n        \"name\":\"id\",\n        \"type\":\"int\"\n    },\n    {\n        \"name\":\"name\",\n        \"type\":\"string\"\n    }\n]",
              "$ xns" : "Roo.data",
              "* prop" : "reader",
              "totalProperty" : "total"
@@ -104,11 +104,6 @@
           }
          ]
         },
-        {
-         "xtype" : "Hidden",
-         "$ xns" : "Roo.form",
-         "name" : "etype"
-        },
         {
          "xtype" : "Hidden",
          "$ xns" : "Roo.form",