extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we use the right app when cleaning select-cat value

Browse Source
This commit is contained in:
nathan 2023-02-24 14:23:11 -07:00
parent bbd41b4255
commit 04bedf30be
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@
namespace EGroupware\Api\Etemplate\Widget; namespace EGroupware\Api\Etemplate\Widget;
use EGroupware\Api\Acl;
use EGroupware\Api\Etemplate; use EGroupware\Api\Etemplate;
use EGroupware\Api; use EGroupware\Api;
@ -86,9 +87,9 @@ class Select extends Etemplate\Widget
{ {
$this->bool_attr_default += array( $this->bool_attr_default += array(
//'multiple' => false, // handeled in set_attrs, as we additional allow "dynamic" //'multiple' => false, // handeled in set_attrs, as we additional allow "dynamic"
'selected_first' => true, 'selected_first' => true,
'search' => false, 'search' => false,
'tags' => false, 'tags' => false,
'allow_single_deselect' => true, 'allow_single_deselect' => true,
); );
@ -432,6 +433,18 @@ class Select extends Etemplate\Widget
'', '',
$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
); );
// Remove unavailable from value
$application = self::expand_name($this->attrs['application'], 0, 0, '', '', self::$cont);
if(!$application || $application === $GLOBALS['egw']->categories->app_name)
{
$categories = $GLOBALS['egw']->categories;
}
else // we need to instanciate a new cat object for the correct application
{
$categories = new Api\Categories('', $application);
}
$value =& self::get_array(self::$request->content, $form_name, true);
$value = $categories->check_list(Acl::READ, $value);
break; break;
} }
} }