Use standard entity permissions
This commit is contained in:
parent
3505e80124
commit
18db434a68
|
@ -4,6 +4,7 @@ type: module
|
|||
package: farmOS
|
||||
core_version_requirement: ^9
|
||||
dependencies:
|
||||
- entity:entity
|
||||
- drupal:taxonomy
|
||||
- farm:asset
|
||||
- farm:farm_log_quantity
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
farm_quick:
|
||||
config_permissions:
|
||||
- configure quick forms
|
||||
- update quick_form
|
||||
default_permissions:
|
||||
- view quick forms index
|
||||
- view quick_form
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
view quick forms index:
|
||||
title: 'View quick forms index'
|
||||
configure quick forms:
|
||||
title: 'Configure quick forms'
|
|
@ -4,7 +4,7 @@ farm.quick:
|
|||
_controller: '\Drupal\farm_quick\Controller\QuickFormController::index'
|
||||
_title: 'Quick forms'
|
||||
requirements:
|
||||
_permission: 'view quick forms index'
|
||||
_permission: 'view quick_form'
|
||||
|
||||
farm_quick.quick_form:
|
||||
path: /quick/{quick_form}
|
||||
|
|
|
@ -20,6 +20,8 @@ use Drupal\farm_quick\QuickFormPluginCollection;
|
|||
* plural = "@count quick forms",
|
||||
* ),
|
||||
* handlers = {
|
||||
* "access" = "\Drupal\entity\EntityAccessControlHandler",
|
||||
* "permission_provider" = "\Drupal\entity\EntityPermissionProvider",
|
||||
* "form" = {
|
||||
* "configure" = "Drupal\farm_quick\Form\ConfigureQuickForm",
|
||||
* },
|
||||
|
|
|
@ -98,8 +98,8 @@ class ConfigureQuickForm extends EntityForm {
|
|||
return AccessResult::forbidden();
|
||||
}
|
||||
|
||||
// Check the configure quick forms permission.
|
||||
$configure_form_access = AccessResult::allowedIfHasPermissions($account, ['configure quick forms']);
|
||||
// Check the update quick_form permission.
|
||||
$configure_form_access = AccessResult::allowedIfHasPermissions($account, ['update quick_form']);
|
||||
return $quick_form->getPlugin()->access($account)->andIf($configure_form_access);
|
||||
}
|
||||
|
||||
|
|
|
@ -34,8 +34,8 @@ class QuickFormTest extends FarmBrowserTestBase {
|
|||
$this->drupalGet('quick');
|
||||
$this->assertSession()->statusCodeEquals(403);
|
||||
|
||||
// Create and login a test user with access to the quick form index.
|
||||
$user = $this->createUser(['view quick forms index']);
|
||||
// Create and login a test user with access to view quick forms.
|
||||
$user = $this->createUser(['view quick_form']);
|
||||
$this->drupalLogin($user);
|
||||
|
||||
// Go to the quick form index and confirm that access is granted, but no
|
||||
|
@ -50,7 +50,7 @@ class QuickFormTest extends FarmBrowserTestBase {
|
|||
|
||||
// Create and login a test user with access to the quick form index, and
|
||||
// permission to create test logs.
|
||||
$user = $this->createUser(['view quick forms index', 'create test log']);
|
||||
$user = $this->createUser(['view quick_form', 'create test log']);
|
||||
$this->drupalLogin($user);
|
||||
|
||||
// Go to the quick form index and confirm that access is granted, and the
|
||||
|
|
Loading…
Reference in New Issue