[IMP] mail: turn Activity/noteAsMarkup as field

Task-2793280 closes odoo/odoo#86370 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
2022-03-14 17:28:44 +00:00
parent a4b7338a95
commit 371c28a8ba
3 changed files with 13 additions and 7 deletions
@@ -5,14 +5,8 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component';
 import Popover from "web.Popover";
 import { LegacyComponent } from "@web/legacy/legacy_component";

-const { markup } = owl;
-
 export class Activity extends LegacyComponent {

-    get noteAsMarkup() {
-        return markup(this.activityView.activity.note);
-    }
-
    /**
     * @returns {ActivityView}
     */
@@ -102,7 +102,7 @@

                    <t t-if="activityView.activity.note">
                        <div class="o_Activity_note">
-                            <t t-out="noteAsMarkup"/>
+                            <t t-out="activityView.activity.noteAsMarkup"/>
                        </div>
                    </t>

@@ -4,6 +4,8 @@ import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { clear, insert, unlink, unlinkAll } from '@mail/model/model_field_command';

+const { markup } = owl;
+
 registerModel({
    name: 'Activity',
    identifyingFields: ['id'],
@@ -228,6 +230,13 @@ registerModel({
            }
            return this.note;
        },
+        /**
+         * @private
+         * @returns {Markup} 
+         */
+        _computeNoteAsMarkup() {
+            return markup(this.note);
+        },
    },
    fields: {
        activityViews: many('ActivityView', {
@@ -275,6 +284,9 @@ registerModel({
        note: attr({
            compute: '_computeNote',
        }),
+        noteAsMarkup: attr({
+            compute: '_computeNoteAsMarkup',
+        }),
        /**
         * Determines that an activity is linked to a requesting partner or not.
         * It will be used notably in website slides to know who triggered the