From 17676a211288375f7a4952426a36a488af437a94 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 6 Dec 2023 13:54:13 -0700 Subject: [PATCH] ImportExport: Fix export date filters lost their "All" option --- api/js/etemplate/Et2Date/Et2DateRange.ts | 2 +- importexport/inc/class.importexport_widget_filter.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/js/etemplate/Et2Date/Et2DateRange.ts b/api/js/etemplate/Et2Date/Et2DateRange.ts index 97d9e852f9..fae8cae39b 100644 --- a/api/js/etemplate/Et2Date/Et2DateRange.ts +++ b/api/js/etemplate/Et2Date/Et2DateRange.ts @@ -112,7 +112,7 @@ export class Et2DateRange extends Et2InputWidget(FormControlMixin(LitElement)) ?readonly=${this.readonly} ?required=${this.required} placeholder=${ifDefined(this.placeholder)} - emptyLabel=${ifDefined(this.emptyLabel)} + .emptyLabel=${ifDefined(this.emptyLabel)} .select_options=${Et2DateRange.relative_dates}>`; } diff --git a/importexport/inc/class.importexport_widget_filter.inc.php b/importexport/inc/class.importexport_widget_filter.inc.php index 4299b84d2e..863d582e7e 100644 --- a/importexport/inc/class.importexport_widget_filter.inc.php +++ b/importexport/inc/class.importexport_widget_filter.inc.php @@ -84,7 +84,7 @@ class importexport_widget_filter extends Etemplate\Widget\Transformer $type = $field['type'] = 'date-range'; $options = ''; $this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'relative', $relative_dates); - $this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'blur', $field['empty_label'] ? $field['empty_label'] : lang('All...')); + $this->setElementAttribute($form_name . '[' . self::$prefix . $lname . ']', 'emptyLabel', $field['empty_label'] ? $field['empty_label'] : lang('All...')); break; case 'ajax_select' : // Set some reasonable defaults for the widget