summaryrefslogtreecommitdiff
path: root/addons/mail/static/src
diff options
context:
space:
mode:
authorjev <jev@odoo.com>2019-01-24 16:48:58 +0000
committerjev-odoo <jev@odoo.com>2019-01-25 09:51:34 +0000
commita4a3bfd373908fb44cb561fbd7cdcf129b5ddc93 (patch)
treed03d72c6a5c6c492679b91c2b4bc10e0b0a1bbfa /addons/mail/static/src
parent5abad42e7b42a3d2b9d82ae9573c1df5a41038ef (diff)
[FIX] mail: activity, crash when activity type is null
When activity_type_id is null on an activity marking it as 'done and schedule schedule next' crashed OPW-1928989 closes odoo/odoo#30522
Diffstat (limited to 'addons/mail/static/src')
-rw-r--r--addons/mail/static/src/js/activity.js2
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 3c7e491edeb..e4470431d51 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -265,7 +265,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));
});