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

Api: User selection = none fixes

Browse Source 
- Fix display was 'false' instead of blank
- Fix widget type check was not preserving original value
This commit is contained in:
nathan 2023-06-26 10:49:25 -06:00
parent 6633230c33
commit dc5b0a4580
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/Et2Select/SelectAccountMixin.ts
View File

@ -96,7 +96,7 @@ export const SelectAccountMixin = <T extends Constructor<LitElement>>(superclass
// Not already cached, need to fetch it // Not already cached, need to fetch it
this.egw().link_title('api-accounts', id, true).then(title => this.egw().link_title('api-accounts', id, true).then(title =>
{ {
option.label = title; option.label = title || '';
this.requestUpdate('select_options'); this.requestUpdate('select_options');
}); });
} }

2
api/src/Etemplate/Widget/Select.php
View File

@ -362,7 +362,7 @@ class Select extends Etemplate\Widget
{ {
// Check selection preference, we may be able to skip reading some data // Check selection preference, we may be able to skip reading some data
$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection']; $select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
if(!empty($this->attrs['type']) && $this->attrs['type'] === 'select-account' && if($type === 'et2-select-account' &&
empty($GLOBALS['egw_info']['user']['apps']['admin']) && $select_pref === 'none') empty($GLOBALS['egw_info']['user']['apps']['admin']) && $select_pref === 'none')
{ {
// Preserve but do not send the value if preference is 'none' // Preserve but do not send the value if preference is 'none'