holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix doubled format string in readonly duration

Browse Source 
- Fix format displayed when duration is 0
This commit is contained in:
nathangray 2020-02-10 15:32:31 -07:00
parent b5af403238
commit 4ef2b0b401
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/js/etemplate/et2_widget_date.js
View File

@ -675,7 +675,7 @@ var et2_date_duration = /** @class */ (function (_super) {
}; };
et2_date_duration.prototype.set_value = function (_value) { et2_date_duration.prototype.set_value = function (_value) {
this.options.value = _value; this.options.value = _value;
var display = this._convert_to_display(_value); var display = this._convert_to_display(parseFloat(_value));
// Set display // Set display
if (this.duration[0].nodeName == "INPUT") { if (this.duration[0].nodeName == "INPUT") {
this.duration.val(display.value); 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) et2_date_duration.prototype.set_display_format = function (format) {
{ if (format.length <= 1) {
if (format.length <= 1)
{
this.node.remove('select.et2_date_duration'); this.node.remove('select.et2_date_duration');
} }
this.options.display_format = format; 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")) this.format = jQuery(document.createElement("select"))
.addClass('et2_date_duration'); .addClass('et2_date_duration');
this.node.append(this.format); 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>"); 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); 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); this.format = jQuery("<span>" + this.time_formats["m"] + "</span>").appendTo(this.node);
} }
}; };

8
api/js/etemplate/et2_widget_date.ts
View File

@ -832,7 +832,7 @@ export class et2_date_duration extends et2_date
{ {
this.options.value = _value; this.options.value = _value;
var display = this._convert_to_display(_value); var display = this._convert_to_display(parseFloat(_value));
// Set display // Set display
if(this.duration[0].nodeName == "INPUT") 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.node.remove('select.et2_date_duration');
} }
this.options.display_format = format; 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")) this.format = jQuery(document.createElement("select"))
.addClass('et2_date_duration'); .addClass('et2_date_duration');