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

fix et2-select-cat globalCategories attribute was not parsed correct (default for not setting the attribute is true!)

Browse Source
This commit is contained in:
ralf 2024-09-12 11:03:53 +02:00
parent acba58111e
commit 0eb67f37ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,7 +709,7 @@ class Select extends Etemplate\Widget
case 'select-cat': case 'select-cat':
// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing // !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
$application = self::expand_name($widget->attrs['application'], 0, 0, '', '', self::$cont) ?? $type3; $application = self::expand_name($widget->attrs['application'], 0, 0, '', '', self::$cont) ?? $type3;
$globalCategories = self::expand_name($widget->attrs['globalCategories'], 0, 0, '', '', self::$cont) ?? $type; $globalCategories = self::expand_name($widget->attrs['globalCategories'], 0, 0, '', '', self::$cont) ?? $type ?? 'true';
$parentCat = self::expand_name($widget->attrs['parentCat'], 0, 0, '', '', self::$cont) ?? $type4; $parentCat = self::expand_name($widget->attrs['parentCat'], 0, 0, '', '', self::$cont) ?? $type4;
if((!$application || $application === $GLOBALS['egw']->categories->app_name) && if((!$application || $application === $GLOBALS['egw']->categories->app_name) &&
@ -722,7 +722,7 @@ class Select extends Etemplate\Widget
$categories = new Api\Categories($type5, $application); $categories = new Api\Categories($type5, $application);
} }
// Allow text for global // Allow text for global
$globalCategories = ($globalCategories && strlen($globalCategories) > 1 ? $globalCategories : !$globalCategories); $globalCategories = $globalCategories && (strlen($globalCategories) > 1 ? $globalCategories === 'true' : (bool)$globalCategories);
// we cast $type4 (parent) to int, to get default of 0 if omitted // we cast $type4 (parent) to int, to get default of 0 if omitted
foreach((array)$categories->return_sorted_array(0, False, '', '', '', $globalCategories, (int)$parentCat, true) as $cat) foreach((array)$categories->return_sorted_array(0, False, '', '', '', $globalCategories, (int)$parentCat, true) as $cat)
{ {