From 6fb943bad0afaa357646fbdcce560590cbc5d3ab Mon Sep 17 00:00:00 2001 From: benny Date: Tue, 11 Sep 2018 13:26:37 +0800 Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js --- Pman.Dialog.CoreEnumMerge.bjs | 2 +- Pman.Dialog.CoreEnumMerge.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs index 2e45d14f..ce5877f7 100644 --- a/Pman.Dialog.CoreEnumMerge.bjs +++ b/Pman.Dialog.CoreEnumMerge.bjs @@ -43,7 +43,7 @@ "listeners" : { "actionfailed" : "function (_self, action)\n{\n \n Pman.standardActionFailed(_self, action);\n}\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 _this.form.findField('_ids').setValue(_this.data._ids);\n _this.form.findField('_names').setValue(_this.data.countrylist);\n this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \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 _this.form.findField('_names').setValue(_this.data.materialList);\n this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n return;\n }\n \n}\n" }, "$ url" : "baseURL + '/Roo/Core_enum.php'", "xtype" : "Form", diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js index a289a97a..a3ce0662 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -130,7 +130,7 @@ Pman.Dialog.CoreEnumMerge = { var title = _this.data.title || _this.data.etype; _this.dialog.setTitle("Delete selected " + title + " and merge data with"); _this.form.findField('_ids').setValue(_this.data._ids); - _this.form.findField('_names').setValue(_this.data.countrylist); + _this.form.findField('_names').setValue(_this.data.materialList); this.load({ method: 'GET', params: { '_id' : _this.data.id }}); return; } -- 2.39.2