diff --git INSTALL_QUICKSTART.txt INSTALL_QUICKSTART.txt index fa39160..c908681 100644 --- INSTALL_QUICKSTART.txt +++ INSTALL_QUICKSTART.txt @@ -56,7 +56,7 @@ include DRUPAL_ROOT . '/sites/all/modules/domain/settings.inc'; the following permissions: -- 'assign domain editors' - -- 'edit domain nodes' + -- 'edit domain content' For more information see README.txt. diff --git README.txt README.txt index afe64b3..cde3c86 100644 --- README.txt +++ README.txt @@ -390,14 +390,14 @@ The Domain Access module has the following permissions: 'assign domain editors' This permission allows users to assign themselves and other users as affiliate editors. For those users to act as editors, their role(s) must also - have the 'edit domain nodes' permission. + have the 'edit domain content' permission. - - 'edit domain nodes' + - 'edit domain content' This permission is for advanced use and substitutes for the normal 'Bypass content access control' permission for sites that give restricted administrative privileges. See section 3.3 for more information. - - 'delete domain nodes' + - 'delete domain content' This permission is for advanced use and substitutes for the normal 'Bypass content access control' permission for sites that give restricted administrative privileges. See section 3.3 for more information. @@ -491,16 +491,16 @@ These permissons grant the ability for a user to edit and delete all nodes of a given type. In the Domain Access model, these permissions are not used in favor of the -provided 'edit domain nodes' and 'delete domain nodes' permissions. These +provided 'edit domain content' and 'delete domain content' permissions. These permissions allow editors only to edit (and delete) nodes that belong to their domain. -To enable this feature, you should grant the 'edit domain nodes' and -(optionally) the 'delete domain nodes' permission to some roles. Then assign +To enable this feature, you should grant the 'edit domain content' and +(optionally) the 'delete domain content' permission to some roles. Then assign individual users accounts to specific domains to assign them as Domain Editors. -NOTE: Users with the 'delete domain nodes' permission must also be given -the 'edit domain nodes' permission in order to delete content. +NOTE: Users with the 'delete domain content' permission must also be given +the 'edit domain content' permission in order to delete content. ---- 3.4 Limitations @@ -920,7 +920,7 @@ advanced editing techniques outlined in section 3. For users without the 'Administer content' permission, certain elements of the node editing form are hidden. These settings allow the site administrator to -enable users with the 'edit domain nodes' permission to have access to those +enable users with the 'edit domain content' permission to have access to those restricted fields. By default, 'Comment settings', 'Delete node', 'Publshing options', and 'Path @@ -1133,7 +1133,7 @@ permission may assign individual users to specific domains in the same way that nodes can be defined. These user settings are used to determine what domains an editor belongs to. -Users with the 'edit domain nodes' permission can edit any node that belongs to +Users with the 'edit domain content' permission can edit any node that belongs to the same domain that the user does. (Remember that users and nodes can both belong to multiple domains.) However, nodes that are assigned to 'all affiliates' do not grant editing privileges to all editors. @@ -1175,7 +1175,7 @@ follows. the gid '0' for realm 'domain_site'. This grant allows all users to see content assigned to 'all affliates'. This grants 'grant_view' to all users. Users who belong to the current domain and are assigned the - 'edit domain nodes' or 'delete domain nodes' permissions will be given + 'edit domain content' or 'delete domain content' permissions will be given 'update' and 'delete' grants, respectively. - domain_id @@ -1208,7 +1208,7 @@ To be more clear about Drupal permissions: In this case, User D and User E can also edit or delete node 10. This is why only super-admins are given 'Bypass content access control' and 'TYPE: edit all content' permissions with the Domain Access module. If you want your affiliate editors -to have limited permissions, only grant them 'edit domain nodes'. +to have limited permissions, only grant them 'edit domain content'. However, you still need to give users the 'TYPE: Create new content' permission normally. Domain Access does not affect node creation. diff --git domain.module domain.module index 2a01c3f..2aec8d1 100644 --- domain.module +++ domain.module @@ -433,7 +433,7 @@ function domain_block_view_information() { * * Attached domain_id records to all registering users. These * are used to determine which 'domain_editor' group that users - * with the 'edit domain nodes' and 'delete domain nodes' permissions are in. + * with the 'edit domain content' and 'delete domain content' permissions are in. */ function domain_user_load($users) { foreach ($users as $uid => $account) { @@ -600,7 +600,7 @@ function domain_form_user_form_alter(&$form, &$form_state) { '#type' => empty($format) ? 'checkboxes' : 'select', '#options' => $options, '#title' => t('Domain access settings'), - '#description' => t('Select the affiliates that this user belongs to. Used to grant editing permissions for users with the "edit domain nodes" permission.'), + '#description' => t('Select the affiliates that this user belongs to. Used to grant editing permissions for users with the "edit domain content" permission.'), '#default_value' => $default ); if ($format) { @@ -1690,9 +1690,9 @@ function domain_node_grants($account, $op) { else { // The $account may not have domain information loaded, so get it. $domains = domain_get_user_domains($account); - $perm = 'delete domain nodes'; + $perm = 'delete domain content'; if ($op == 'update') { - $perm = 'edit domain nodes'; + $perm = 'edit domain content'; } if (user_access($perm, $account)) { if (!empty($domains)) { @@ -2169,7 +2169,7 @@ function domain_form_alter(&$form, &$form_state, $form_id) { // THIS SECTION BREAKS CCK if we don't check for cck_dummy_node_form! See http://drupal.org/node/186624 // and note the !$form['#node']->cck_dummy_node_form in the IF check at the top of the function. // Some editors cannot administer nodes, so we have to add these form elements. - if (user_access('edit domain nodes')) { + if (user_access('edit domain content')) { $access = variable_get('domain_form_elements', array('options', 'delete', 'comment_settings', 'path')); foreach ($access as $item) { $form[$item]['#access'] = TRUE; diff --git domain_content/README.txt domain_content/README.txt index e5dce25..f50c5b2 100644 --- domain_content/README.txt +++ domain_content/README.txt @@ -51,7 +51,7 @@ modules directory. After reading this document, enable the module normally. When you enable the module, no new tables will be created in your Drupal database. -If you wish for users with the 'edit domain nodes' permission to access the +If you wish for users with the 'edit domain content' permission to access the Domain Content interface, you must enable the 'Use access control for editors' option under Advanced Settings on the Domains configuration page: @@ -81,12 +81,12 @@ See http://drupal.org/node/367752 for the rationale. The relevant permissions to Domain Content are: - - 'edit domain nodes' + - 'edit domain content' - 'set domain access' - 'review content for all domains' - 'administer nodes' -Users with the 'edit domain nodes' permission can view content for domains where +Users with the 'edit domain content' permission can view content for domains where they are assigned editors. Users with the 'set domain access' permission can view content for domains where they are assigned editors _and_ reassign content to one or more affiliates. @@ -94,7 +94,7 @@ to one or more affiliates. Users with the core 'administer nodes' permission may view and edit content on any affiliate. -Either the 'administer nodes', 'edit domain nodes' or the 'review content for all +Either the 'administer nodes', 'edit domain content' or the 'review content for all domains' permission is required to access the 'Affiliated content' screen. ---- diff --git domain_content/domain_content.admin.inc domain_content/domain_content.admin.inc index f10aa12..32abd7c 100644 --- domain_content/domain_content.admin.inc +++ domain_content/domain_content.admin.inc @@ -412,7 +412,7 @@ function domain_content_filter_operations(&$operations) { return; } // You must be able to edit to view this page, so check for the new delete perm. - if (!user_access('delete domain nodes')) { + if (!user_access('delete domain content')) { unset($operations['delete']); } // The publish, promote and sticky operations all depend on having $settings['options']. diff --git domain_content/domain_content.module domain_content/domain_content.module index 17c621d..4b08ba4 100644 --- domain_content/domain_content.module +++ domain_content/domain_content.module @@ -11,7 +11,7 @@ * @file * Editorial overview module. * - * Provides batch node editing for users with 'edit domain nodes' permission + * Provides batch node editing for users with 'edit domain content' permission * but without the 'administer nodes' permission. * * @ingroup domain_content @@ -104,7 +104,7 @@ function domain_content_menu_check() { if (user_access('administer nodes')) { return TRUE; } - if (user_access('edit domain nodes') || user_access('review content for all domains')) { + if (user_access('edit domain content') || user_access('review content for all domains')) { return TRUE; } return FALSE; @@ -122,8 +122,8 @@ function domain_content_check($domain_id) { if (user_access('administer nodes') || user_access('review content for all domains')) { return TRUE; } - $rule = user_access('edit domain nodes'); - // Otherwise, the user must be able to edit domain nodes. + $rule = user_access('edit domain content'); + // Otherwise, the user must be able to edit domain content. if (!$rule) { return FALSE; }