summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js/views/activity/activity_renderer.js
diff options
context:
space:
mode:
authorHiral Bhavsar <hbh@odoo.com>2018-12-13 12:51:54 +0000
committerMartin Geubelle <mge@odoo.com>2019-05-03 10:19:40 +0000
commitb5ed9a7e2ebcdfeb4ab155e17e715a5dc59666e4 (patch)
tree16b7342cf01f824b80504bcba996da9ee2e1265a /addons/mail/static/src/js/views/activity/activity_renderer.js
parentb2de618f9ff9969ff0644f3be10752f23d9738dc (diff)
[REF] mail: correctly implement the deadline precision
In activity view, there was a dummy logic for the deadline precision (the year was not displayed if it was the current year). This has been fixed with a valid logic as per locale. Related to task 1894990
Diffstat (limited to 'addons/mail/static/src/js/views/activity/activity_renderer.js')
-rw-r--r--addons/mail/static/src/js/views/activity/activity_renderer.js16
1 files changed, 7 insertions, 9 deletions
diff --git a/addons/mail/static/src/js/views/activity/activity_renderer.js b/addons/mail/static/src/js/views/activity/activity_renderer.js
index 640a8859767..278816548c1 100644
--- a/addons/mail/static/src/js/views/activity/activity_renderer.js
+++ b/addons/mail/static/src/js/views/activity/activity_renderer.js
@@ -149,16 +149,14 @@ var ActivityRenderer = AbstractRenderer.extend({
var widget = new KanbanActivity(self, "activity_ids", record, {});
widget.appendTo($td).then(function() {
// replace clock by closest deadline
- var $date = $('<div>');
- var formated_date = moment(activity_group.o_closest_deadline).format('ll');
- var current_year = (new Date()).getFullYear();
- if (formated_date.endsWith(current_year)) { // Dummy logic to remove year (only if current year), we will maybe need to improve it
- formated_date = formated_date.slice(0, -4);
- formated_date = formated_date.replace(/( |,)*$/g, "");
+ var $date = $('<div class="o_closest_deadline">');
+ var date = new Date(activity_group.o_closest_deadline);
+ // To remove year only if current year
+ if (moment().year() === moment(date).year()) {
+ $date.text(date.toLocaleDateString(moment().locale(), { day: 'numeric', month: 'short' }));
+ } else {
+ $date.text(moment(date).format('ll'));
}
- $date
- .text(formated_date)
- .addClass('o_closest_deadline');
$td.find('a')
.empty()
.append($date);