From 1ad5d321a49dcc4c8da5740a8818d903713038a5 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 28 Aug 2020 13:53:23 -0600
Subject: [PATCH] Etemplate: Fix double duration format in timesheet nextmatch
 header

---
 api/js/etemplate/et2_widget_date.js | 1 +
 api/js/etemplate/et2_widget_date.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/js/etemplate/et2_widget_date.js b/api/js/etemplate/et2_widget_date.js
index 832b4b0730..92a91b35fa 100644
--- a/api/js/etemplate/et2_widget_date.js
+++ b/api/js/etemplate/et2_widget_date.js
@@ -695,6 +695,7 @@ var et2_date_duration = /** @class */ (function (_super) {
     et2_date_duration.prototype.set_display_format = function (format) {
         if (format.length <= 1) {
             this.node.remove('select.et2_date_duration');
+            this.format.remove();
             this.format = null;
         }
         this.options.display_format = format;
diff --git a/api/js/etemplate/et2_widget_date.ts b/api/js/etemplate/et2_widget_date.ts
index 543a4fbce9..16f9f14bdb 100644
--- a/api/js/etemplate/et2_widget_date.ts
+++ b/api/js/etemplate/et2_widget_date.ts
@@ -861,6 +861,7 @@ export class et2_date_duration extends et2_date
         if (format.length <= 1)
         {
             this.node.remove('select.et2_date_duration');
+            this.format.remove();
             this.format = null;
         }
         this.options.display_format = format;