mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-10 08:44:46 +02:00
Code Issues Releases Wiki Activity

Update Role and User classes to use new $permissions->getDelegatedMethod() where appropriate

Browse Source
This commit is contained in:
Ryan Cramer
2023-07-19 14:29:36 -04:00
parent bf144afd65
commit 05cdf08949
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wire/core/Role.php
View File

@@ -108,6 +108,13 @@ class Role extends Page {
if(!ctype_alnum(str_replace('-', '', $name))) { if(!ctype_alnum(str_replace('-', '', $name))) {
$name = $this->wire()->sanitizer->pageName($name); $name = $this->wire()->sanitizer->pageName($name);
} }
if($context) {
$method = $permissions->getDelegatedMethod($name, $context);
if($method) {
// non-installed permission delegates to a method call such as $page->editable()
return $context->$method();
}
}
$delegated = $permissions->getDelegatedPermissions(); $delegated = $permissions->getDelegatedPermissions();
if(isset($delegated[$name])) $name = $delegated[$name]; if(isset($delegated[$name])) $name = $delegated[$name];
} }
@@ -243,4 +250,3 @@ class Role extends Page {
} }
} }

4
wire/core/User.php
View File

@@ -261,6 +261,10 @@ class User extends Page {
// code later on will make sure they exist in the template's addRoles/createRoles // code later on will make sure they exist in the template's addRoles/createRoles
$p = 'page-edit'; $p = 'page-edit';
} else if(!$permissions->has($name)) { } else if(!$permissions->has($name)) {
if($page) {
$method = $permissions->getDelegatedMethod($name, $page);
if($method) return $page->$method(); // i.e. $page->editable()
}
$delegated = $permissions->getDelegatedPermissions(); $delegated = $permissions->getDelegatedPermissions();
$p = isset($delegated[$name]) ? $delegated[$name] : $name; $p = isset($delegated[$name]) ? $delegated[$name] : $name;
} else { } else {