From: benny <benny@roojs.com>
Date: Tue, 18 Sep 2018 06:28:30 +0000 (+0800)
Subject: cmmit
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f12ac2231937272bac00b022c1c70babbcbc5aeb

cmmit
---

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 4202ea94..f9c58b2b 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -42,7 +42,7 @@
       {
        "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(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",
+        "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(_this.data._ids) == \"undefined\"){\n            this.load({ method: 'GET', params: { '_id' : _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}"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 340714ca..3e8d8415 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -131,9 +131,8 @@ Pman.Dialog.CoreEnumMerge = {
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
                   
           
-                  if(typeof(_ids) == "undefined"){
+                  if(typeof(_this.data._ids) == "undefined"){
                       this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
-                      _this.form.findField('id').setValue(_this.data.id);
                       return;
                   }
                   _this.form.findField('_names').setValue(_this.data._names);