extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:12:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

add extra parameter return_promise to StaticOptions.cached_server_side and using that for Et2SelectCountry to add flags and their css class

Browse Source
This commit is contained in:
ralf 2022-06-20 17:01:28 +02:00
parent ce474a1cd1
commit 8228104b82
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -615,13 +615,15 @@ export class Et2SelectCountry extends Et2Select
this.search = true; this.search = true;
this.select_options = so.country(this, {}).map((country) => { so.country(this, {}, true).then(options => options.map((country) => {
if (country.value[0] !== '-') if (country.value[0] !== '-')
{ {
country.icon = egw.image('flags'); country.icon = egw.image('flags');
country.class = 'flag-'+country.value.toLowerCase(); country.class = 'flag-'+country.value.toLowerCase();
} }
return country; return country;
})).then(options => {
this.select_options = options
}); });
} }
} }

18
api/js/etemplate/Et2Select/StaticOptions.ts
View File

@ -23,11 +23,12 @@ export type Et2SelectWidgets = Et2Select | Et2WidgetWithSelect | Et2SelectReadon
* @param {et2_selectbox} widget Selectbox we're looking at * @param {et2_selectbox} widget Selectbox we're looking at
* @param {string} options_string * @param {string} options_string
* @param {Object} attrs Widget attributes (not yet fully set) * @param {Object} attrs Widget attributes (not yet fully set)
* @returns {Object} Array of options, or empty and they'll get filled in later * @param {boolean} return_promise true: always return a promise
* @returns {Object[]|Promise<Object[]>} Array of options, or empty and they'll get filled in later, or Promise
*/ */
export class StaticOptions export class StaticOptions
{ {
cached_server_side(widget : Et2SelectWidgets, type : string, options_string) : SelectOption[] cached_server_side(widget : Et2SelectWidgets, type : string, options_string, return_promise? : boolean) : SelectOption[]|Promise<SelectOption[]>
{ {
// normalize options by removing trailing commas // normalize options by removing trailing commas
options_string = options_string.replace(/,+$/, ''); options_string = options_string.replace(/,+$/, '');
@ -54,9 +55,12 @@ export class StaticOptions
if(typeof cache.then === 'function') if(typeof cache.then === 'function')
{ {
// pending, wait for it // pending, wait for it
cache.then((response) => const promise = cache.then((response) =>
{ {
cache = cache_owner[cache_id] = response.response[0].data || undefined; cache = cache_owner[cache_id] = response.response[0].data || undefined;
if (return_promise) return cache;
// Set select_options in attributes in case we get a response before // Set select_options in attributes in case we get a response before
// the widget is finished loading (otherwise it will re-set to {}) // the widget is finished loading (otherwise it will re-set to {})
//widget.select_options = cache; //widget.select_options = cache;
@ -67,7 +71,7 @@ export class StaticOptions
widget.set_select_options(find_select_options(widget, {}, cache)); widget.set_select_options(find_select_options(widget, {}, cache));
} }
}); });
return []; return return_promise ? promise : [];
} }
else else
{ {
@ -106,7 +110,7 @@ export class StaticOptions
} }
} }
} }
return cache; return return_promise ? Promise.resolve(cache) : cache;
} }
} }
@ -243,10 +247,10 @@ export class StaticOptions
return this.cached_server_side(widget, 'select-cat', options.join(',')) return this.cached_server_side(widget, 'select-cat', options.join(','))
} }
country(widget : Et2SelectWidgets, attrs) : SelectOption[] country(widget : Et2SelectWidgets, attrs, return_promise) : SelectOption[]|Promise<SelectOption[]>
{ {
var options = ','; var options = ',';
return this.cached_server_side(widget, 'select-country', options); return this.cached_server_side(widget, 'select-country', options, return_promise);
} }
state(widget : Et2SelectWidgets, attrs) : SelectOption[] state(widget : Et2SelectWidgets, attrs) : SelectOption[]