From 8681d21301d601f2b0fda20a1ca67227be7a4e00 Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 4 Nov 2016 13:14:40 +0800 Subject: [PATCH] Pman.Dialog.AdminCompanyMerge.bjs Pman.Dialog.AdminCompanyMerge.js --- Pman.Dialog.AdminCompanyMerge.bjs | 2 +- Pman.Dialog.AdminCompanyMerge.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs index c314011..b8719c4 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 \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 _this.dialog.setTitle(\"Delete selected \" + _this.data.name + \" 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 ec8e627..eabcc26 100644 --- a/Pman.Dialog.AdminCompanyMerge.js +++ b/Pman.Dialog.AdminCompanyMerge.js @@ -117,8 +117,7 @@ Pman.Dialog.AdminCompanyMerge = { if (action.type == 'setdata') { - var title = _this.data.title || _this.data.etype; - _this.dialog.setTitle("Delete selected " + title + " and merge data with"); + _this.dialog.setTitle("Delete selected " + _this.data.name + " and merge data with"); return; } -- 2.39.2