From: benny <benny@roojs.com>
Date: Wed, 12 Sep 2018 07:31:35 +0000 (+0800)
Subject: Pman.Dialog.CoreEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f5e2e8a5575950c3f3b30a9b05bb9522dc6f9da8

Pman.Dialog.CoreEnumMerge.bjs
Pman.Dialog.CoreEnumMerge.js
---

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 69083eee..23dd6c6f 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(!_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",
+        "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.materialList);\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 b79e2fb0..aafc0b5f 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -136,7 +136,7 @@ Pman.Dialog.CoreEnumMerge = {
                       _this.form.findField('id').setValue(_this.data.id);
                       return;
                   }
-                  _this.form.findField('_names').setValue(_this.data._names);
+                  _this.form.findField('_names').setValue(_this.data.materialList);
                   _this.form.findField('_ids').setValue(_this.data._ids);
                   return;
               }