From 6984a05de000092d9bd669b369b1275ad88968db Mon Sep 17 00:00:00 2001 From: benny Date: Wed, 12 Sep 2018 15:47:24 +0800 Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js --- Pman.Dialog.CoreEnumMerge.bjs | 2 +- Pman.Dialog.CoreEnumMerge.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs index c28fefcb..0d906e64 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.materialList);\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._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 c9f14e55..860bc951 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -131,12 +131,12 @@ Pman.Dialog.CoreEnumMerge = { _this.dialog.setTitle("Delete selected " + title + " and merge data with"); - if(_this.data._ids != ""){ + if(_this.data._ids == ""){ 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.materialList); + _this.form.findField('_names').setValue(_this.data._names); _this.form.findField('_ids').setValue(_this.data._ids); return; } -- 2.39.2