Commit 0323bf46 authored by Vasilii Lukasevich's avatar Vasilii Lukasevich Committed by maxwellkeeble
Browse files

Issue #3306821 by lukasss: User role(s) plugin not working properly

parent f269f97d

src/Plugin/ComplexConditions/Condition/UserRole.php

+8 −6
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ class UserRole extends ComplexConditionBase { 
    if ($this->configuration['user_roles_any_all'] == 'any') {

      // Any:

      $message = count($rolesNames) == 1 ? 'User must have this website role: @roles' : 'User has any of the following website roles: @roles';

      $requirements['has_any_roles'] = new ConditionRequirement([

      $requirements[] = new ConditionRequirement([

        'id' => 'has_any_roles',

        'label' => t($message, [

          '@roles' => implode(', ', $rolesNames),
@@ -106,10 +106,11 @@ class UserRole extends ComplexConditionBase { 
        'description' => t('Roles are generally granted by the site administrator or based on your user type.'),

        'pass' => count(array_intersect($rolesToCheck, $userRoles)) > 0,

      ]);

    } else {

    }

    else {

      // All:

      $message = count($rolesNames) == 1 ? 'User must have this website role: @roles' : 'User has all of the following website roles: @roles';

      $requirements['has_all_roles'] = new ConditionRequirement([

      $requirements[] = new ConditionRequirement([

        'id' => 'has_all_roles',

        'label' => t($message, [

          '@roles' => implode(', ', $rolesNames),
@@ -137,4 +138,5 @@ class UserRole extends ComplexConditionBase { 


    return $config;

  }



}