Skip to content

[5.3] Fix field group permission check #44956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdeutz merged 2 commits into from
Feb 27, 2025
Merged

[5.3] Fix field group permission check #44956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a9733f
Fix Field Group permission check
joomdonation Feb 22, 2025
356bd9d
Merge branch '5.3-dev' into fix_field_group_permission_check
rdeutz Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions administrator/components/com_fields/src/Model/GroupModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,13 @@ public function getForm($data = [], $loadData = true)
return false;
}

// Modify the form based on Edit State access controls.
if (empty($data['context'])) {
$data['context'] = $context;
}
$record = new \stdClass();
$record->context = $context;
$record->id = $jinput->get('id');

$user = $this->getCurrentUser();

if (!$user->authorise('core.edit.state', $context . '.fieldgroup.' . $jinput->get('id'))) {
if (!$this->canEditState($record)) {
// Disable fields for display.
$form->setFieldAttribute('ordering', 'disabled', 'true');
$form->setFieldAttribute('state', 'disabled', 'true');
Expand Down Expand Up @@ -160,7 +159,9 @@ protected function canDelete($record)
return false;
}

return $this->getCurrentUser()->authorise('core.delete', $record->context . '.fieldgroup.' . (int) $record->id);
$component = explode('.', $record->context)[0];

return $this->getCurrentUser()->authorise('core.delete', $component . '.fieldgroup.' . (int) $record->id);
}

/**
Expand All @@ -177,13 +178,15 @@ protected function canEditState($record)
{
$user = $this->getCurrentUser();

$component = explode('.', $record->context)[0];

// Check for existing fieldgroup.
if (!empty($record->id)) {
return $user->authorise('core.edit.state', $record->context . '.fieldgroup.' . (int) $record->id);
return $user->authorise('core.edit.state', $component . '.fieldgroup.' . (int) $record->id);
}

// Default to component settings.
return $user->authorise('core.edit.state', $record->context);
return $user->authorise('core.edit.state', $component);
}

/**
Expand Down