Skip to content

Commit 955dec8

Browse files
committed
fix: apply eligibility check to UI properties, not core resolution
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
1 parent af63402 commit 955dec8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

lib/Service/Policy/Runtime/DefaultPolicyResolver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private function resolveCore(
5353
$currentSourceScope = 'system';
5454
$currentBlockedBy = null;
5555
$canOverrideBelow = false;
56-
$visible = $definition->isUserEligible($context);
56+
$visible = true;
5757

5858
if ($systemLayer !== null) {
5959
[$currentValue, $currentSourceScope, $canOverrideBelow, $visible] = $this->applyLayer(
@@ -136,10 +136,10 @@ private function resolveCore(
136136
->setEffectiveValue($currentValue)
137137
->setInheritedValue($inheritedValue)
138138
->setSourceScope($currentSourceScope)
139-
->setVisible($visible)
139+
->setVisible($visible && $definition->isUserEligible($context))
140140
->setEditableByCurrentActor($visible && $this->canManagePolicyAtCurrentScope($context))
141-
->setCanSaveAsUserDefault($visible && $canOverrideBelow && $definition->supportsUserPreference())
142-
->setCanUseAsRequestOverride($visible && $canOverrideBelow && $definition->supportsUserPreference())
141+
->setCanSaveAsUserDefault($visible && $canOverrideBelow && $definition->supportsUserPreference() && $definition->isUserEligible($context))
142+
->setCanUseAsRequestOverride($visible && $canOverrideBelow && $definition->supportsUserPreference() && $definition->isUserEligible($context))
143143
->setBlockedBy($currentBlockedBy);
144144

145145
return $resolved;

0 commit comments

Comments
 (0)