Commit 464c1e05 authored by Adam Shepherd's avatar Adam Shepherd
Browse files

Issue #3172576 by AdamPS, thomasmurphy, morvaim, bsuttis: Admin user cannot...

Issue #3172576 by AdamPS, thomasmurphy, morvaim, bsuttis: Admin user cannot bulk add/remove roles when using VBO
parent 658de156
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -25,8 +25,12 @@ trait ChangeUserRoleTrait {
   */
  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
    $form = parent::buildConfigurationForm($form, $form_state);
    $allowed = \Drupal::service('administerusersbyrole.access')->listRoles('role-assign', \Drupal::currentUser());
    $account = \Drupal::currentUser();

    if (!$account->hasPermission('administer users')) {
      $allowed = \Drupal::service('administerusersbyrole.access')->listRoles('role-assign', $account);
      $form['rid']['#options'] = array_intersect_key($form['rid']['#options'], array_flip($allowed));
    }
    return $form;
  }