From 4ef2b0b4019495460dffd1bdb7e971820aedb83f Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 10 Feb 2020 15:32:31 -0700
Subject: [PATCH] - Fix doubled format string in readonly duration - Fix format
 displayed when duration is 0

---
 api/js/etemplate/et2_widget_date.js | 23 ++++++++++-------------
 api/js/etemplate/et2_widget_date.ts |  8 ++++++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/api/js/etemplate/et2_widget_date.js b/api/js/etemplate/et2_widget_date.js
index 335335e377..7eda1e0c5a 100644
--- a/api/js/etemplate/et2_widget_date.js
+++ b/api/js/etemplate/et2_widget_date.js
@@ -675,7 +675,7 @@ var et2_date_duration = /** @class */ (function (_super) {
     };
     et2_date_duration.prototype.set_value = function (_value) {
         this.options.value = _value;
-        var display = this._convert_to_display(_value);
+        var display = this._convert_to_display(parseFloat(_value));
         // Set display
         if (this.duration[0].nodeName == "INPUT") {
             this.duration.val(display.value);
@@ -693,29 +693,26 @@ var et2_date_duration = /** @class */ (function (_super) {
             }
         }
     };
-    et2_date_duration.prototype.set_display_format = function (format)
-    {
-        if (format.length <= 1)
-        {
+    et2_date_duration.prototype.set_display_format = function (format) {
+        if (format.length <= 1) {
             this.node.remove('select.et2_date_duration');
         }
         this.options.display_format = format;
-        if (this.options.display_format.length > 1)
-        {
+        if (this.format) {
+            this.format.remove();
+        }
+        if (this.options.display_format.length > 1 && !this.options.readonly) {
             this.format = jQuery(document.createElement("select"))
                 .addClass('et2_date_duration');
             this.node.append(this.format);
-            for (var i = 0; i < this.options.display_format.length; i++)
-            {
+            for (var i = 0; i < this.options.display_format.length; i++) {
                 this.format.append("<option value='" + this.options.display_format[i] + "'>" + this.time_formats[this.options.display_format[i]] + "</option>");
             }
         }
-        else if (this.time_formats[this.options.display_format])
-        {
+        else if (this.time_formats[this.options.display_format]) {
             this.format = jQuery("<span>" + this.time_formats[this.options.display_format] + "</span>").appendTo(this.node);
         }
-        else
-        {
+        else {
             this.format = jQuery("<span>" + this.time_formats["m"] + "</span>").appendTo(this.node);
         }
     };
diff --git a/api/js/etemplate/et2_widget_date.ts b/api/js/etemplate/et2_widget_date.ts
index 9e4258f69d..36d15f0c20 100644
--- a/api/js/etemplate/et2_widget_date.ts
+++ b/api/js/etemplate/et2_widget_date.ts
@@ -832,7 +832,7 @@ export class et2_date_duration extends et2_date
 	{
 		this.options.value = _value;
 
-		var display = this._convert_to_display(_value);
+		var display = this._convert_to_display(parseFloat(_value));
 
 		// Set display
 		if(this.duration[0].nodeName == "INPUT")
@@ -864,7 +864,11 @@ export class et2_date_duration extends et2_date
             this.node.remove('select.et2_date_duration');
         }
         this.options.display_format = format;
-        if(this.options.display_format.length > 1)
+        if(this.format)
+        {
+			this.format.remove();
+		}
+        if(this.options.display_format.length > 1 && !this.options.readonly)
 		{
 			this.format = jQuery(document.createElement("select"))
 							.addClass('et2_date_duration');