From ad3826c1343ad8a8fe7ba7afb194a40c2ea41d8f Mon Sep 17 00:00:00 2001
From: benny <benny@roojs.com>
Date: Thu, 13 Sep 2018 10:23:35 +0800
Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js

---
 Pman.Dialog.CoreEnumMerge.bjs | 10 +++++-----
 Pman.Dialog.CoreEnumMerge.js  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 0d906e64..728470bd 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -42,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        \n\n        if(_this.data._ids == \"\"){\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n            _this.form.findField('id').setValue(_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}"
+        "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        \n\n        if(typeof _ids == \"undefined\"){\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n            _this.form.findField('id').setValue(_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"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
-       "method" : "POST",
        "xtype" : "Form",
+       "method" : "POST",
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
        "Number labelWidth" : 120,
        "items" : [
         {
          "String name" : "_names",
-         "Number width" : 250,
          "Boolean readOnly" : true,
+         "Number width" : 250,
          "xtype" : "TextField",
          "String fieldLabel" : "Delete this",
          "$ xns" : "Roo.form"
@@ -96,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 860bc951..f2de0463 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -131,7 +131,7 @@ Pman.Dialog.CoreEnumMerge = {
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
                   
           
-                  if(_this.data._ids == ""){
+                  if(typeof _ids == "undefined"){
                       this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
                       _this.form.findField('id').setValue(_this.data.id);
                       return;
-- 
2.39.2