diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-29 13:17:12 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-29 13:17:12 +0100 |
| commit | cd5c8a02f9560b2a8b5c39182adee7ade1bf595c (patch) | |
| tree | c654b3d46020aa30fcc7c2724d200a93a807859b /addons/mail/static | |
| parent | 6c6ef6588fc374e86acdeeacba2842690b6f1a53 (diff) | |
| parent | 36d96e015032d42449fe149c050df75050276fdc (diff) | |
[MERGE] forward port branch 11.0 up to 36d96e01503
Diffstat (limited to 'addons/mail/static')
| -rw-r--r-- | addons/mail/static/src/js/activity.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js index 6e66d73ea07..aa537635938 100644 --- a/addons/mail/static/src/js/activity.js +++ b/addons/mail/static/src/js/activity.js @@ -277,7 +277,7 @@ var Activity = AbstractActivityField.extend({ $popover.find('#activity_feedback').val(self.feedbackValue[activity_id]); $popover.on('click', '.o_activity_popover_done_next', function () { var feedback = _.escape($popover.find('#activity_feedback').val()); - var previous_activity_type_id = $popover_el.data('previous-activity-type-id'); + var previous_activity_type_id = $popover_el.data('previous-activity-type-id') || false; self._markActivityDone(activity_id, feedback) .then(self.scheduleActivity.bind(self, previous_activity_type_id)); }); |