Pman.Dialog.CoreEnumMerge.bjs

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

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index efb8c99..cac6577 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -13,6 +13,12 @@
   "68be4837f6c739877233e527a996dd00" : "Merge",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
+ "named_strings" : {
+  "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
+  "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
+  "_merge_id_name_fieldLabel" : "03e956f1dca2b4d525df03cb1899cb6f"
+ },
  "items" : [
   {
    "listeners" : {
@@ -40,8 +46,8 @@
      "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       return;\n    }\n    \n}\n",
         "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
@@ -50,6 +56,11 @@
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
        "items" : [
+        {
+         "xtype" : "Input",
+         "$ xns" : "Roo.form",
+         "name" : "etype"
+        },
         {
          "alwaysQuery" : true,
          "listWidth" : 400,
@@ -70,13 +81,13 @@
          "$ xns" : "Roo.form",
          "name" : "_merge_id_name",
          "qtip" : "Select Item to Merge With",
-         "queryParam" : "query[name]",
+         "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    o.params['etype'] = _this.data.etype;\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,
@@ -85,7 +96,7 @@
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Companies.php'",
+             "$ url" : "baseURL + '/Roo/Core_enum'",
              "xtype" : "HttpProxy",
              "method" : "GET",
              "$ xns" : "Roo.data",
@@ -129,7 +140,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",