diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index 468580914d..979bea4e5e 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -966,16 +966,16 @@ var et2_nextmatch = /** @class */ (function (_super) { } // Pass along column alignment if (_row[x].align && columnWidgets[x]) { - columnWidgets[x].align = _row[x].align; - } - } - this.rowProvider.setDataRowTemplate(columnWidgets, _rowData, this); - // Create the grid controller - this.controller = new et2_extension_nextmatch_controller_1.et2_nextmatch_controller(null, this.egw(), this.getInstanceManager().etemplate_exec_id, this, null, this.dataview.grid, this.rowProvider, this.options.settings.action_links, null, this.options.actions); - // Need to trigger empty row the first time - if (total == 0) - this.controller._emptyRow(); - // Set data cache prefix to either provided custom or auto + columnWidgets[x].align = _row[x].align; + } + } + this.rowProvider.setDataRowTemplate(columnWidgets, _rowData, this); + // Create the grid controller + this.controller = new et2_extension_nextmatch_controller_1.et2_nextmatch_controller(null, this.egw(), this.getInstanceManager().etemplate_exec_id, this, null, this.dataview.grid, this.rowProvider, this.options.settings.action_links, null, this.options.actions); + // Need to trigger empty row the first time + if (total == 0) + this.controller._emptyRow(); + // Set data cache prefix to either provided custom or auto if (!this.options.settings.dataStorePrefix && this.options.settings.get_rows) { // Use jsapi data module to update var list = this.options.settings.get_rows.split('.', 2); @@ -1106,13 +1106,14 @@ var et2_nextmatch = /** @class */ (function (_super) { }, this); autoRefresh_1.set_id("nm_autorefresh"); autoRefresh_1.set_select_options({ - // Cause [unknown] problems with mail - //30: "30 seconds", - //60: "1 Minute", - 300: "5 Minutes", - 900: "15 Minutes", - 1800: "30 Minutes" - }); + // Cause [unknown] problems with mail + //30: "30 seconds", + //60: "1 Minute", + 180: "3 Minutes", + 300: "5 Minutes", + 900: "15 Minutes", + 1800: "30 Minutes" + }); autoRefresh_1.set_value(this._get_autorefresh()); autoRefresh_1.set_statustext(egw.lang("Automatically refresh list")); var defaultCheck = et2_createWidget("select", { "empty_label": "Preference" }, this); diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts index 15752ab109..649bdf8d17 100644 --- a/api/js/etemplate/et2_extension_nextmatch.ts +++ b/api/js/etemplate/et2_extension_nextmatch.ts @@ -1557,13 +1557,14 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2 }, this); autoRefresh.set_id("nm_autorefresh"); autoRefresh.set_select_options({ - // Cause [unknown] problems with mail - //30: "30 seconds", - //60: "1 Minute", - 300: "5 Minutes", - 900: "15 Minutes", - 1800: "30 Minutes" - }); + // Cause [unknown] problems with mail + //30: "30 seconds", + //60: "1 Minute", + 180: "3 Minutes", + 300: "5 Minutes", + 900: "15 Minutes", + 1800: "30 Minutes" + }); autoRefresh.set_value(this._get_autorefresh()); autoRefresh.set_statustext(egw.lang("Automatically refresh list")); diff --git a/api/lang/egw_de.lang b/api/lang/egw_de.lang index 2850127efa..fab9c62a38 100644 --- a/api/lang/egw_de.lang +++ b/api/lang/egw_de.lang @@ -45,6 +45,7 @@ 13 (ntp) admin de 13 (ntp) 15 minutes common de 15 Minuten 2-factor-authentication common de 2-Faktor-Authentifizierung +3 minutes common de 3 Minuten 30 minutes common de 30 Minuten 30 seconds common de 30 Sekunden 5 minutes common de 5 Minuten diff --git a/api/lang/egw_en.lang b/api/lang/egw_en.lang index 8b32031003..714eeb4c61 100644 --- a/api/lang/egw_en.lang +++ b/api/lang/egw_en.lang @@ -45,6 +45,7 @@ 13 (ntp) admin en 13 (ntp) 15 minutes common en 15 minutes 2-factor-authentication common en 2-Factor-Authentication +3 minutes common en 3 minutes 30 minutes common en 30 minutes 30 seconds common en 30 seconds 5 minutes common en 5 minutes