From c8f10474bbf659224d846154da5669b1d57ea5ef Mon Sep 17 00:00:00 2001 From: benny Date: Wed, 12 Sep 2018 12:38:29 +0800 Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js --- Pman.Dialog.CoreEnumMerge.bjs | 2 +- Pman.Dialog.CoreEnumMerge.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs index 4bb959c2..6d80ad05 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 _this.form.findField('_ids').setValue(_this.data._ids);\n \n if(!_this.data._ids){\n this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n _this.form.findField('_names').setValue(_this.data.name);\n }\n \n _this.data.findField('_names').setValue(_this.data.materialList);\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 _this.form.findField('_ids').setValue(_this.data._ids);\n \n if(!_this.data._ids){\n this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n _this.form.findField('_names').setValue(_this.data.name);\n return;\n }\n \n _this.data.findField('_names').setValue(_this.data.materialList);\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 8e1c7fa0..70bc6e96 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -132,8 +132,9 @@ Pman.Dialog.CoreEnumMerge = { _this.form.findField('_ids').setValue(_this.data._ids); if(!_this.data._ids){ - this.load({ method: 'GET', params: { '_id' : _this.data.id }}); - _this.form.findField('_names').setValue(_this.data.name); + this.load({ method: 'GET', params: { '_id' : _this.data.id }}); + _this.form.findField('_names').setValue(_this.data.name); + return; } _this.data.findField('_names').setValue(_this.data.materialList); -- 2.39.2