From 139d6ea1e2cd916547cfc8ad34a92ac2cdb37c4d Mon Sep 17 00:00:00 2001 From: KKamaa Date: Tue, 20 Jul 2021 09:39:16 +0300 Subject: [PATCH] [FIX] autofill, formatting, fix --- .../demo/ir_config_parameter_data.xml | 6 ++--- .../static/src/js/support_branding.js | 26 ++++++++++++------- support_branding/static/src/xml/base.xml | 1 + 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/support_branding/demo/ir_config_parameter_data.xml b/support_branding/demo/ir_config_parameter_data.xml index df026f89d..ef9bf9417 100644 --- a/support_branding/demo/ir_config_parameter_data.xml +++ b/support_branding/demo/ir_config_parameter_data.xml @@ -3,11 +3,11 @@ support_company - Sunflower IT + Odoo Community Association support_company_url - https://www.sunflowerweb.nl + https://odoo-community.org support_branding_color @@ -15,7 +15,7 @@ support_email - info@sunflowerweb.nl + oca@example.com support_release diff --git a/support_branding/static/src/js/support_branding.js b/support_branding/static/src/js/support_branding.js index 0aa4f558e..829f739a0 100644 --- a/support_branding/static/src/js/support_branding.js +++ b/support_branding/static/src/js/support_branding.js @@ -72,10 +72,12 @@ odoo.define("support_branding.CrashManager", function (require) { var body = error.data.debug; var inputs = "" + - '\n" + - '"; dialog.opened(function () { @@ -83,6 +85,7 @@ odoo.define("support_branding.CrashManager", function (require) { var $statement = $(".support-statement"); var $description = $(".support-desc"); var $button = $(".support-btn"); + var $close_btn = $(".close"); var $body = $(".sp-body"); var $header = $form.parents(".modal-dialog").find(".modal-header"); var $footer = $form.parents(".modal-dialog").find(".modal-footer"); @@ -90,7 +93,7 @@ odoo.define("support_branding.CrashManager", function (require) { $statement.prepend(inputs); if (self.support_cp_email) { if (self.support_cp_name) { - var title = "Support By " + self.support_cp_name; + var title = "Support by " + self.support_cp_name; $('

' + title + "

").insertBefore( ".support-branding-submit-form" ); @@ -135,13 +138,12 @@ odoo.define("support_branding.CrashManager", function (require) { model: "mail.mail", method: "send", args: [mail_id], - }).then(function (res) { - if (res) { - self.do_notify( - "Success", - "Support mail created!" - ); - } + }).then(function () { + self.do_notify( + "Success", + "Support mail created!" + ); + $close_btn.click(); }); } }, @@ -157,6 +159,10 @@ odoo.define("support_branding.CrashManager", function (require) { $button.css({display: "none"}); } $form.prependTo($footer); + // Hide "Ok" button since we have close on the dialog top + // Allow send email btn to close once done. + $footer.find("button:eq(1)").css({display: "none"}); + if (self.support_cp_color) { $header.css({background: self.support_cp_color}); $footer.css({background: self.support_cp_color}); diff --git a/support_branding/static/src/xml/base.xml b/support_branding/static/src/xml/base.xml index 416f3afc9..4e1e1ff4f 100644 --- a/support_branding/static/src/xml/base.xml +++ b/support_branding/static/src/xml/base.xml @@ -12,6 +12,7 @@