' . t('Active editors for the %section section, as assigned by user. View editors by role.', array('%section' => $access_info['name'], '!url' => url('admin/config/workbench/access/roles/' . $scheme['access_type'] . '/' . $scheme['access_id']))); + $output .= workbench_access_admin_note(); + $form['content'] = array( + '#weight' => -5, + '#markup' => $output, + ); + // Get the list of user roles that can be assigned workbench access. $roles = workbench_access_get_roles('access workbench access by role'); @@ -670,10 +689,6 @@ function workbench_access_editor_form_submit($form, &$form_state) { */ function theme_workbench_access_editor_form($variables) { $form = $variables['form']; - $scheme = $form['workbench_access']['#value']; - $access_info = workbench_access_load_access_info($scheme); - $output = '
' . t('Active editors for the %section section, as assigned by user. View editors by role.', array('%section' => $access_info['name'], '!url' => url('admin/config/workbench/access/roles/' . $scheme['access_type'] . '/' . $scheme['access_id']))); $header = array(t('Editor'), t('Actions')); $rows = array(); foreach (element_children($form['users']) as $key) { @@ -687,6 +702,7 @@ function theme_workbench_access_editor_form($variables) { 'rows' => $rows, 'empty' => t('No active editors.'), ); + $output = drupal_render($form['content']); $output .= theme('table', $variables); $output .= drupal_render_children($form); return $output; @@ -742,7 +758,8 @@ function workbench_access_role_form($form, &$form_state, $access_type, $access_t $access_info = workbench_access_load($access_type, $access_type_id); $output = '
' . t('Active editors for the %section section, as determined by role. View editors by user.', array('%section' => $access_info['name'], '!url' => url('admin/config/workbench/access/editors/' . $active['access_scheme']['access_type'] . '/' . $access_type_id))); - $header = array(t('Editors'), t('Roles')); + $output .= workbench_access_admin_note(); + $header = array(t('Editor'), t('Role(s)')); $rows = array(); $access_rids = array(); if (!empty($roles)) { @@ -1026,3 +1043,10 @@ function workbench_access_breadcrumb($breadcrumb = array()) { $current = array_merge($current, $breadcrumb); drupal_set_breadcrumb($current); } + +/** + * Adds a universal note about super-admins. + */ +function workbench_access_admin_note() { + return '
' . t('Note: This list may not include administrators with the "Bypass Workbench Access section restrictions" permission.') . '
'; +} diff --git a/workbench_access.module b/workbench_access.module index 3964d36..32a5a88 100644 --- a/workbench_access.module +++ b/workbench_access.module @@ -211,6 +211,9 @@ function workbench_access_permission() { 'administer workbench access' => array( 'title' => t('Administer Workbench Access settings'), ), + 'bypass workbench access' => array( + 'title' => t('Bypass Workbench Access section restrictions'), + ), 'assign workbench access' => array( 'title' => t('Assign users to Workbench Access sections'), ), @@ -356,9 +359,9 @@ function workbench_access_load_include($module = NULL) { * Enforces our access rules when users try to edit/delete a node. */ function workbench_access_node_access($node, $op, $account) { - // If not configured, do nothing. + // If not configured or a super-user, do nothing. $tree = workbench_access_get_active_tree(); - if (empty($tree['active'])) { + if (empty($tree['active']) || user_access('bypass workbench access')) { return NODE_ACCESS_IGNORE; } @@ -772,29 +775,40 @@ function workbench_access_user_load_data($account) { $account->workbench_access = $lookup[$account->uid]; return; } - // Get the user's assigned access sections. - $query = db_select('workbench_access_user', 'wau') - ->addTag('workbench_access_user') - ->fields('wau', array('access_id')) - ->condition('wau.uid', $account->uid) - ->condition('wau.access_scheme', $access_scheme); - $result = $query->execute()->fetchAll(); - $items = array(); - foreach ($result as $data) { - $items[$data->access_id] = $data; - } - // Add roles. - $query = db_select('workbench_access_role', 'war') - ->addTag('workbench_access_role') - ->fields('war', array('access_id')) - ->condition('war.rid', array_keys($account->roles), 'IN') - ->condition('war.access_scheme', $access_scheme); - $result = $query->execute()->fetchAll(); - foreach ($result as $data) { - if (!isset($items[$data->access_id])) { + // The 'bypass workbench_access' rule assigns a user to all sections.' + if (!user_access('bypass workbench access')) { + // Get the user's assigned access sections. + $query = db_select('workbench_access_user', 'wau') + ->addTag('workbench_access_user') + ->fields('wau', array('access_id')) + ->condition('wau.uid', $account->uid) + ->condition('wau.access_scheme', $access_scheme); + $result = $query->execute()->fetchAll(); + $items = array(); + foreach ($result as $data) { $items[$data->access_id] = $data; - // Identify the access-by-role features. - $account->workbench_access_by_role[] = $data->access_id; + } + + // Add roles. + $query = db_select('workbench_access_role', 'war') + ->addTag('workbench_access_role') + ->fields('war', array('access_id')) + ->condition('war.rid', array_keys($account->roles), 'IN') + ->condition('war.access_scheme', $access_scheme); + $result = $query->execute()->fetchAll(); + foreach ($result as $data) { + if (!isset($items[$data->access_id])) { + $items[$data->access_id] = $data; + // Identify the access-by-role features. + $account->workbench_access_by_role[] = $data->access_id; + } + } + } + else { + foreach ($active['tree'] as $id => $data) { + if ($data['depth'] === 0) { + $items[$id] = (object) $data; + } } } foreach ($items as $item) {