From 92342628e9278a5d88dc69f4e415cb6e34de0d9c Mon Sep 17 00:00:00 2001
From: benny <benny@roojs.com>
Date: Tue, 11 Sep 2018 13:13:12 +0800
Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js

---
 Pman.Dialog.CoreEnumMerge.bjs | 19 ++++++-------------
 Pman.Dialog.CoreEnumMerge.js  |  2 ++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 85b88460..72f09a14 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.CoreEnumMerge",
  "parent" : "",
  "title" : "",
- "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
+ "path" : "/home/benny/gitlive/web.Texon/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -14,13 +14,6 @@
   "266459bee8ed1ca2e0464899e1ef0994" : "And replace with",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
- "named_strings" : {
-  "display_name_fieldLabel" : "8324cdec05065c4bd7d8c5effdf43edf",
-  "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
-  "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
-  "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
-  "_merge_id_name_fieldLabel" : "266459bee8ed1ca2e0464899e1ef0994"
- },
  "items" : [
   {
    "listeners" : {
@@ -49,20 +42,20 @@
       {
        "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         this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \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    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        //_this.form.findField('_ids').setValue(_this.data._ids);\n        //_this.form.findField('_names').setValue(_this.data.countrylist);\n         this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n        return;\n    }\n    \n}\n"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
-       "method" : "POST",
        "xtype" : "Form",
+       "method" : "POST",
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
        "Number labelWidth" : 120,
        "items" : [
         {
          "String name" : "display_name",
-         "Number width" : 250,
          "Boolean readOnly" : true,
+         "Number width" : 250,
          "xtype" : "TextField",
          "String fieldLabel" : "Delete this",
          "$ xns" : "Roo.form"
@@ -103,8 +96,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_enum'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index b22b89f4..ef128e9e 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -129,6 +129,8 @@ Pman.Dialog.CoreEnumMerge = {
                   
                    var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
+                  //_this.form.findField('_ids').setValue(_this.data._ids);
+                  //_this.form.findField('_names').setValue(_this.data.countrylist);
                    this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
                   return;
               }
-- 
2.39.2