From 22904af1f8a2ce527711ddec251a6f918c82790a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Fri, 2 Jul 2021 10:00:20 +0000
Subject: [PATCH] [FIX] website_event_exhibitor: de-traw-ify

Remove t-raw and mark website_description as markup-safe right after
fetching it.

Also update `_fetchSponsor` to use async/await, and remove seemingly
unnecessary empty div in template, and convert `<span>` to `<div>` as
the contents is arbitrary and thus could be a block.
---
 .../static/src/js/event_exhibitor_connect.js     | 16 ++++++----------
 .../static/src/xml/event_exhibitor_connect.xml   |  4 +---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js b/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js
index 7743147d87f..2d530fe4a74 100644
--- a/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js
+++ b/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js
@@ -3,6 +3,7 @@ odoo.define('website_event_exhibitor.event_exhibitor_connect', function (require
 
 var Dialog = require('web.Dialog');
 var publicWidget = require('web.public.widget');
+const {Markup} = require('web.utils');
 
 var ExhibitorConnectClosedDialog = Dialog.extend({
     events: _.extend({}, Dialog.prototype.events, {
@@ -44,18 +45,13 @@ var ExhibitorConnectClosedDialog = Dialog.extend({
 
     /**
      * @private
-     * @returns {Promise<*>} promise after fetching sponsor data, given its
-     *   sponsorId. Necessary to render template content;
      */
-    _fetchSponsor: function () {
-        let self = this;
-        let rpcPromise = this._rpc({
-            route: `/event_sponsor/${this.sponsorId}/read`,
-        }).then(function (readData) {
-            self.sponsorData = readData;
-            return Promise.resolve();
+    async _fetchSponsor() {
+        const sponsorData = await this._rpc({
+            route: `/event_sponsor/${this.sponsorId}/read`
         });
-        return rpcPromise;
+        sponsorData.website_description = Markup(sponsorData.website_description);
+        this.sponsorData = sponsorData;
     },
 });
 
diff --git a/addons/website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml b/addons/website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml
index 1e138a44b12..8ccd6cec411 100644
--- a/addons/website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml
+++ b/addons/website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml
@@ -67,9 +67,7 @@
                             t-att-alt="widget.sponsorData.country_name"/>
                     </div>
                 </div>
-                <span class="col-12" t-if="widget.sponsorData.website_description" t-raw="widget.sponsorData.website_description"/>
-            </div>
-            <div>
+                <div class="col-12" t-if="widget.sponsorData.website_description" t-out="widget.sponsorData.website_description"/>
             </div>
         </div>
     </t>