holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Categories are cached client side now

Browse Source
This commit is contained in:
nathan 2022-07-19 10:32:33 -06:00
parent 5ee60c0af1
commit dc23a18f85
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ class Select extends Etemplate\Widget
'select-account', 'select-account',
'select-app', 'select-app',
'select-bool', 'select-bool',
'select-cat',
'select-country', 'select-country',
// DOW needs some server-side pre-processing to unpack the options, // DOW needs some server-side pre-processing to unpack the options,
// so can't be skipped. // so can't be skipped.
@ -347,7 +348,8 @@ class Select extends Etemplate\Widget
unset(self::$request->content[$this->id]); unset(self::$request->content[$this->id]);
$this->attrs['readonly'] = true; $this->attrs['readonly'] = true;
} }
if(!in_array($type, self::$cached_types)) // Check for type not cached, or type less et2- prefix not a cached type
if(!in_array($type, self::$cached_types) && !in_array(substr($type, 4), self::$cached_types))
{ {
// adding type specific options here, while keep further options set by app code // adding type specific options here, while keep further options set by app code
// we need to make sure to run only once for auto-repeated rows, because // we need to make sure to run only once for auto-repeated rows, because
@ -359,7 +361,8 @@ class Select extends Etemplate\Widget
($type_options = self::typeOptions($this, ($type_options = self::typeOptions($this,
// typeOptions thinks # of rows is the first thing in options // typeOptions thinks # of rows is the first thing in options
(!empty($this->attrs['rows']) && !empty($this->attrs['options']) && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'] . ',' . $this->attrs['options'] : ($this->attrs['options'] ?? null)), (!empty($this->attrs['rows']) && !empty($this->attrs['options']) && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'] . ',' . $this->attrs['options'] : ($this->attrs['options'] ?? null)),
$no_lang, $this->attrs['readonly'] ?? false, self::get_array(self::$request->content, $form_name), $form_name))) $no_lang, $this->attrs['readonly'] ?? false, self::get_array(self::$request->content, $form_name), $form_name
)))
{ {
self::fix_encoded_options($type_options); self::fix_encoded_options($type_options);