From 0a3ad62e400ecc08e91097319acdbf4bf8d8de01 Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Fri, 4 Dec 2020 10:28:14 +0000
Subject: [PATCH] [IMP] mail: save/restore the feedback in the activity model
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

task-2397404

closes odoo/odoo#64094

X-original-commit: 74453020c89facd504c140023e302a72ae6b415e
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../activity_mark_done_popover.js                    | 12 ++++++++++++
 .../activity_mark_done_popover.xml                   |  2 +-
 addons/mail/static/src/models/activity/activity.js   |  6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js
index 993c5f84703..e951b5e4737 100644
--- a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js
+++ b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js
@@ -28,6 +28,9 @@ class ActivityMarkDonePopover extends Component {
 
     mounted() {
         this._feedbackTextareaRef.el.focus();
+        if (this.activity.feedbackBackup) {
+            this._feedbackTextareaRef.el.value = this.activity.feedbackBackup;
+        }
     }
 
     /**
@@ -59,6 +62,15 @@ class ActivityMarkDonePopover extends Component {
     // Handlers
     //--------------------------------------------------------------------------
 
+    /**
+     * @private
+     */
+    _onBlur() {
+        this.activity.update({
+            feedbackBackup: this._feedbackTextareaRef.el.value,
+        });
+    }
+
     /**
      * @private
      */
diff --git a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml
index 3f6ab67cd0c..1e6f8d4b0bb 100644
--- a/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml
+++ b/addons/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml
@@ -4,7 +4,7 @@
     <t t-name="mail.ActivityMarkDonePopover" owl="1">
         <div class="o_ActivityMarkDonePopover" t-on-keydown="_onKeydown">
             <t t-if="activity">
-                <textarea class="form-control o_ActivityMarkDonePopover_feedback" rows="3" placeholder="Write Feedback" t-ref="feedbackTextarea"/>
+                <textarea class="form-control o_ActivityMarkDonePopover_feedback" rows="3" placeholder="Write Feedback" t-on-blur="_onBlur" t-ref="feedbackTextarea"/>
                 <div class="o_ActivityMarkDonePopover_buttons">
                     <button type="button" class="o_ActivityMarkDonePopover_doneScheduleNextButton btn btn-sm btn-primary" t-on-click="_onClickDoneAndScheduleNext" t-esc="DONE_AND_SCHEDULE_NEXT"/>
                     <t t-if="!activity.force_next">
diff --git a/addons/mail/static/src/models/activity/activity.js b/addons/mail/static/src/models/activity/activity.js
index 1d66d39beb7..8ee51e9711d 100644
--- a/addons/mail/static/src/models/activity/activity.js
+++ b/addons/mail/static/src/models/activity/activity.js
@@ -283,6 +283,12 @@ function factory(dependencies) {
         creator: many2one('mail.user'),
         dateCreate: attr(),
         dateDeadline: attr(),
+        /**
+         * Backup of the feedback content of an activity to be marked as done in the popover.
+         * Feature-specific to restoring the feedback content when component is re-mounted.
+         * In all other cases, this field value should not be trusted.
+         */
+        feedbackBackup: attr(),
         force_next: attr({
             default: false,
         }),