mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
et2-select-tab widget to fix common preferences not storing and some fixes
This commit is contained in:
parent
244d42cfb0
commit
bec95a4a9d
@ -550,6 +550,55 @@ export class Et2SelectApp extends Et2StaticSelectMixin(Et2Select)
|
||||
// @ts-ignore TypeScript is not recognizing that this widget is a LitElement
|
||||
customElements.define("et2-select-app", Et2SelectApp);
|
||||
|
||||
export class Et2SelectTab extends Et2SelectApp
|
||||
{
|
||||
constructor()
|
||||
{
|
||||
super();
|
||||
|
||||
this.allowFreeEntries = true;
|
||||
}
|
||||
|
||||
set value(new_value)
|
||||
{
|
||||
const values = Array.isArray(new_value) ? new_value : [new_value];
|
||||
const options = this.select_options;
|
||||
values.forEach(value => {
|
||||
if (!options.filter(option => option.value == value).length)
|
||||
{
|
||||
const matches = value.match(/^([a-z0-9]+)\-/i);
|
||||
let option : SelectOption = {value: value, label: value};
|
||||
if (matches)
|
||||
{
|
||||
option = options.filter(option => option.value == matches[1])[0];
|
||||
option.value = value;
|
||||
option.label += ' '+egw.lang('Tab');
|
||||
}
|
||||
try {
|
||||
const app = opener?.framework.getApplicationByName(value);
|
||||
if (app && app.displayName)
|
||||
{
|
||||
option.label = app.displayName;
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
// ignore security exception, if opener is not accessible
|
||||
}
|
||||
this.select_options.concat(option);
|
||||
}
|
||||
})
|
||||
super.value = new_value;
|
||||
}
|
||||
|
||||
get value()
|
||||
{
|
||||
return super.value;
|
||||
}
|
||||
}
|
||||
|
||||
// @ts-ignore TypeScript is not recognizing that this widget is a LitElement
|
||||
customElements.define("et2-select-tab", Et2SelectTab);
|
||||
|
||||
export class Et2SelectBitwise extends Et2StaticSelectMixin(Et2Select)
|
||||
{
|
||||
set value(new_value)
|
||||
|
@ -44,7 +44,20 @@ export const Et2StaticSelectMixin = <T extends Constructor<Et2WidgetWithSelect>>
|
||||
get select_options() : SelectOption[]
|
||||
{
|
||||
// @ts-ignore
|
||||
return [...super.select_options, ...this.static_options];
|
||||
const options = super.select_options || [];
|
||||
// make sure result is unique
|
||||
if (options.length && this.static_options.length)
|
||||
{
|
||||
const union = [].concat(options);
|
||||
this.static_options.forEach(option => {
|
||||
if (!union.filter(opt => opt.value == option.value).length)
|
||||
{
|
||||
union.concat(option);
|
||||
}
|
||||
});
|
||||
return union;
|
||||
}
|
||||
return [...options, ...(this.static_options || [])];
|
||||
}
|
||||
|
||||
set select_options(new_options)
|
||||
|
@ -1313,7 +1313,7 @@ export function loadWebComponent(_nodeName : string, _template_node : Element|{[
|
||||
let widget = <Et2Widget>document.createElement(_nodeName);
|
||||
widget.textContent = _template_node.textContent;
|
||||
|
||||
if (parent) widget.setParent(parent);
|
||||
if (parent && typeof widget.setParent === 'function') widget.setParent(parent);
|
||||
|
||||
// Set read-only. Doesn't really matter if it's a ro widget, but otherwise it needs set
|
||||
widget.readonly = readonly;
|
||||
|
@ -143,7 +143,11 @@ class Select extends Etemplate\Widget
|
||||
public function validate($cname, array $expand, array $content, &$validated=array())
|
||||
{
|
||||
$form_name = self::form_name($cname, $this->id, $expand);
|
||||
$widget_type = $this->attrs['type'] ? $this->attrs['type'] : $this->type;
|
||||
$widget_type = $this->attrs['type'] ?? $this->type;
|
||||
if (substr($widget_type, 0, 4) === 'et2-')
|
||||
{
|
||||
$widget_type = substr($widget_type, 4);
|
||||
}
|
||||
$multiple = $this->attrs['multiple'] || $this->getElementAttribute($form_name, 'multiple') || $this->getElementAttribute($form_name, 'rows') > 1;
|
||||
|
||||
$ok = true;
|
||||
@ -208,6 +212,17 @@ class Select extends Etemplate\Widget
|
||||
}
|
||||
break;
|
||||
|
||||
case 'select-app':
|
||||
case 'select-tab':
|
||||
if (!in_array($val, $allowed) &&
|
||||
!($widget_type === 'select-tab' && preg_match('/^[a-z0-9]+\-[a-z0-9]+$/i', $val, $matches) && in_array($matches[1], $allowed)))
|
||||
{
|
||||
self::set_validation_error($form_name, lang("'%1' is NOT a valid app-name ('%2')!", $val, implode("', '",$allowed)),'');
|
||||
$value = '';
|
||||
break 2;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if(!in_array($val, $allowed))
|
||||
{
|
||||
|
@ -458,6 +458,12 @@ class preferences_settings
|
||||
$setting['type'] = 'et2-select';
|
||||
$tpl->setElementAttribute($tab . '[' . $setting['name'] . ']', 'multiple', true);
|
||||
break;
|
||||
case 'select-tab':
|
||||
case 'select-tabs':
|
||||
$setting['type'] = 'et2-select-tab';
|
||||
$tpl->setElementAttribute($tab . '[' . $setting['name'] . ']', 'allowFreeEntries', true);
|
||||
$tpl->setElementAttribute($tab . '[' . $setting['name'] . ']', 'multiple', $old_type === 'select-tabs');
|
||||
break;
|
||||
case 'color':
|
||||
$setting['type'] = 'et2-colorpicker';
|
||||
break;
|
||||
@ -715,4 +721,4 @@ class preferences_settings
|
||||
}
|
||||
return True;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user