Pman.Dialog.AdminCompanyMerge.bjs

[Pman.Admin] / Pman.Dialog.AdminCompanyMerge.bjs

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index c9fc01b..24e1174 100644 (file)
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -7,7 +7,7 @@
  "modOrder" : "001",
  "strings" : {
   "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
-  "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
+  "d928853fb4dfe148595cef31a72d52f5" : "Merge Company",
   "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
@@ -16,11 +16,11 @@
  "items" : [
   {
    "listeners" : {
-    "show" : "function (_self)\n{\n    if (_this.isBuilder) {\n        _this.data = { id : 2, comptype : 'SUPPLIER' }\n    }\n}"
+    "show" : "function (_self)\n{\n    \n}"
    },
    "modal" : true,
    "collapsible" : false,
-   "title" : "Merge Pulldown Option",
+   "title" : "Merge Company",
    "xtype" : "LayoutDialog",
    "width" : 400,
    "$ xns" : "Roo",
@@ -41,10 +41,10 @@
       {
        "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    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",
+        "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}"
        },
-       "$ url" : "baseURL + '/Roo/Core_enum.php'",
+       "$ url" : "baseURL + '/Roo/Core_company.php'",
        "method" : "POST",
        "xtype" : "Form",
        "style" : "margin: 10px;",
@@ -76,7 +76,7 @@
          "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['etype'] = _this.data.etype;\n    \n    o.params['!id'] = _this.form.findField('id').getValue();\n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
@@ -85,7 +85,7 @@
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Core_enum'",
+             "$ url" : "baseURL + '/Roo/Core_company'",
              "xtype" : "HttpProxy",
              "method" : "GET",
              "$ xns" : "Roo.data",
@@ -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"