diff --git a/intranet/static/js/announcement.form.js b/intranet/static/js/announcement.form.js
index 69e668caf1..98c90f7968 100644
--- a/intranet/static/js/announcement.form.js
+++ b/intranet/static/js/announcement.form.js
@@ -71,7 +71,8 @@ $(function() {
$(".exp-header").css("display", "none");
for (var i = 0; i < dates.length; i++) {
var use_date = dates[i].end ? dates[i].end.date() : dates[i].start.date();
- $(".exp-list").append(`
"${dates[i].text}" - ${use_date}`);
+ var display_date = use_date.toDateString();
+ $(".exp-list").append(`"${dates[i].text}" - ${display_date}`);
}
});
@@ -100,13 +101,16 @@ $(function() {
$(".exp-header").css("display", "none");
for (var i = 0; i < dates.length; i++) {
var use_date = dates[i].end ? dates[i].end.date() : dates[i].start.date();
- $(".exp-list").append(`"${dates[i].text}" - ${use_date}`);
+ var display_date = use_date.toDateString();
+ $(".exp-list").append(`"${dates[i].text}" - ${display_date}`);
}
});
var exp = $("#id_expiration_date");
- dateReset(exp);
+ if (exp.val() === "" || exp.val() === "3000-01-01 00:00:00") {
+ dateReset(exp);
+ }
$(".helptext", exp.parent()).before("