Commit 69bc7133 authored by Nikolay Lobachev's avatar Nikolay Lobachev
Browse files

Issue #3299945 by LOBsTerr, kecsot: Use route access not custom code

parent aa18305d

grequest.routing.yml

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ entity.group.group_request_membership: 
    _title_callback: '\Drupal\grequest\Controller\GroupMembershipRequestController::requestMembershipTitle'

  requirements:

    _group_permission: 'request group membership'

    _group_installed_content: 'group_membership_request'

    _group_member: 'FALSE'

  options:

    parameters:
@@ -16,6 +17,7 @@ entity.group_content.group_approve_membership: 
  defaults:

    _controller: '\Drupal\grequest\Controller\GroupMembershipRequestController::approveMembership'

  requirements:

    _group_installed_content: 'group_membership_request'

    _group_permission: 'administer membership requests'

  options:

    parameters:
@@ -29,6 +31,7 @@ entity.group_content.group_reject_membership: 
  defaults:

    _controller: '\Drupal\grequest\Controller\GroupMembershipRequestController::rejectMembership'

  requirements:

    _group_installed_content: 'group_membership_request'

    _group_permission: 'administer membership requests'

  options:

    parameters:

src/Plugin/GroupContentEnabler/GroupMembershipRequest.php

+3 −2
Original line number Diff line number Diff line
@@ -79,10 +79,11 @@ class GroupMembershipRequest extends GroupContentEnablerBase { 
    $operations = [];



    $entity_instances = $group->getContentByEntityId($this->getPluginId(), $account->id());

    if (!$group->getMember($account) && $group->hasPermission('request group membership', $account) && count($entity_instances) == 0) {

    $url = $group->toUrl('group-request-membership');

    if($url->access($account) && count($entity_instances) == 0){

      $operations['group-request-membership'] = [

        'title' => $this->t('Request group membership'),

        'url' => $group->toUrl('group-request-membership'),

        'url' => $url,

        'weight' => 99,

      ];

    }

src/Plugin/views/field/RequestMembership.php

+3 −3
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ final class RequestMembership extends FieldPluginBase { 
      $build['#markup'] = $this->t('Already member');

    }

    elseif (empty($membership_requests)) {

      if ($group->hasPermission('request group membership', $this->currentUser)) {

        $build = $group->toLink($this->t('Request Membership'), 'group-request-membership')

          ->toString();

      $link = $group->toLink($this->t('Request Membership'), 'group-request-membership');

      if($link->getUrl()->access($this->currentUser)){

        $build = $link->toString();

      }

    }

    else {