Browse Source
Merge pull request #55462 from IONOS-Productivity/fix/admin_delegation-show-all-priority-items
Fix admin delegation show all priority items
pull/54278/merge
Côme Chilliet
3 weeks ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
2 additions and
1 deletions
-
apps/settings/lib/Command/AdminDelegation/Show.php
|
|
|
@ -112,6 +112,7 @@ class Show extends Base { |
|
|
|
return [ |
|
|
|
'name' => $setting->getName() ?: 'Global', |
|
|
|
'className' => $className, |
|
|
|
'priority' => $setting->getPriority(), |
|
|
|
'delegatedGroups' => $groups, |
|
|
|
]; |
|
|
|
}, $settings); |
|
|
|
@ -155,6 +156,6 @@ class Show extends Base { |
|
|
|
* @param array $innerSection |
|
|
|
*/ |
|
|
|
private function getDelegatedSettings(array $settings, array $innerSection): array { |
|
|
|
return $settings + array_filter($innerSection, fn (ISettings $setting) => $setting instanceof IDelegatedSettings); |
|
|
|
return array_merge($settings, array_filter($innerSection, fn (ISettings $setting) => $setting instanceof IDelegatedSettings)); |
|
|
|
} |
|
|
|
} |