From 819f7957defbb51fbfeeb2f36972ebb0a7eb8d14 Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 4 Nov 2016 13:13:12 +0800 Subject: [PATCH] Pman.Dialog.AdminCompanyMerge.bjs Pman.Dialog.AdminCompanyMerge.js --- Pman.Dialog.AdminCompanyMerge.bjs | 2 +- Pman.Dialog.AdminCompanyMerge.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs index c3cfa59..c314011 100644 --- a/Pman.Dialog.AdminCompanyMerge.bjs +++ b/Pman.Dialog.AdminCompanyMerge.bjs @@ -41,7 +41,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 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 \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 return;\n }\n \n}\n", "rendered" : "function (form)\n{\n _this.form = form;\n}" }, "$ url" : "baseURL + '/Roo/Core_company.php'", diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js index 7a035e8..ec8e627 100644 --- a/Pman.Dialog.AdminCompanyMerge.js +++ b/Pman.Dialog.AdminCompanyMerge.js @@ -114,6 +114,7 @@ Pman.Dialog.AdminCompanyMerge = { _this.form.reset(); return; } + if (action.type == 'setdata') { var title = _this.data.title || _this.data.etype; -- 2.39.2