' . t('For more information, see the online handbook entry for Node module.', array('@node' => 'http://drupal.org/handbook/modules/node/')) . '
'; return $output; case 'admin/content/node': + case 'admin/content/node/all': return ' '; // Return a non-null value so that the 'more help' link is shown. case 'admin/build/types': return '' . t('Below is a list of all the content types on your site. All posts that exist on your site are instances of one of these content types.') . '
'; @@ -1182,6 +1183,10 @@ function node_perm() { 'title' => t('Access content'), 'description' => t('View published content.'), ), + 'access content listings' => array( + 'title' => t('Access content listings'), + 'description' => t('List and filter available content from the administrative content pages.'), + ), 'bypass node access' => array( 'title' => t('Bypass node access'), 'description' => t('View, edit and delete all site content. Users with this permission will bypass any content-related access control. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), @@ -1515,14 +1520,22 @@ function node_menu() { 'title' => 'Content', 'description' => "View, edit, and delete your site's content.", 'page callback' => 'drupal_get_form', - 'page arguments' => array('node_admin_content'), - 'access arguments' => array('administer nodes'), + 'page arguments' => array('node_admin_content', TRUE), + 'access callback' => 'node_content_page_access', ); - $items['admin/content/node/overview'] = array( - 'title' => 'List', + $items['admin/content/node/user'] = array( + 'title' => 'My Content', 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, + ); + + $items['admin/content/node/all'] = array( + 'title' => 'All Content', + 'description' => "View, edit, and delete your site's content.", + 'page arguments' => array('node_admin_content'), + 'access callback' => 'node_content_page_access', + 'type' => MENU_LOCAL_TASK, + 'weight' => 5, ); $items['admin/content/node-settings'] = array( @@ -2149,6 +2162,33 @@ function node_access($op, $node, $accoun } /** + * Checks whether the current user has access to the content list page. + */ +function node_content_page_access() { + // If the user has no permission to access content, deny. + if (!user_access('access content')) { + return FALSE; + } + + if (!user_access('access content listings')) { + return FALSE; + } + + $types = node_get_types('types'); + foreach ($types as $type) { + $permissions = node_list_permissions(check_plain($type->type)); + $permissions['administer nodes'] = 'administer nodes'; + foreach (array_keys($permissions) as $permission) { + if (user_access($permission)) { + return TRUE; + } + } + } + + return FALSE; +} + +/** * Generate an SQL join clause for use in fetching a node listing. * * @param $node_alias Index: ./modules/node/node.test =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.test,v retrieving revision 1.7 diff -u -p -r1.7 node.test --- ./modules/node/node.test 11 Oct 2008 18:29:20 -0000 1.7 +++ ./modules/node/node.test 21 Oct 2008 02:57:24 -0000 @@ -460,3 +460,46 @@ class NodeTitleXSSTestCase extends Drupa $this->assertNoRaw($xss, t('Harmful tags are escaped when editing a node.')); } } +class ContentAdminPagesCase extends DrupalWebTestCase { + /** + * Implementation of getInfo(). + */ + function getInfo() { + return array( + 'name' => t('Content Admin Pages'), + 'description' => t('Create users and content to test the content admin pages functionality.'), + 'group' => t('Node'), + ); + } + function setUp() { + parent::setUp(); + $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer nodes', 'bypass node access')); + $this->base_user = $this->drupalCreateUser(array('access content listings', 'edit own page content', 'create page content')); + } + function testContentAdminPages() { + $this->drupalLogin($this->admin_user); + + // Ensure the admin user can edit any content. + $created_node = $this->drupalCreateNode(array('type' => 'page')); + $this->drupalGet('admin/content/node'); + $this->assertResponse(200); + $this->drupalGet('admin/content/node/all'); + $this->assertResponse(200); + $this->assertText('edit', t('Admin user has edit link.')); + $this->drupalLogout(); + + // Ensure users don't see edit links for content they don't have rights to edit. + $this->drupalLogin($this->base_user); + $this->drupalGet('admin/content/node/all'); + $this->assertResponse(200); + $this->assertText($created_node->title, t('Unprivileged users can view content.')); + $this->assertNoText('edit', t('Edit links do not show up for users without rights.')); + + // Ensure users content shows up on their 'My Content' page, and they have edit links. + $user_node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user->uid)); + $this->drupalGet('admin/content/node'); + $this->assertText($user_node->title, t('Users own content is displayed')); + $this->assertNoText($created_node->title, t('Nodes not belong to user are not displayed')); + + } +} Index: ./modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.272 diff -u -p -r1.272 system.install --- ./modules/system/system.install 13 Oct 2008 20:29:42 -0000 1.272 +++ ./modules/system/system.install 21 Oct 2008 02:57:25 -0000 @@ -389,6 +389,7 @@ function system_install() { // Authenticated role permissions. db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access comments'); db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access content'); + db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access content listings'); db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'post comments'); db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'post comments without approval'); Index: ./profiles/default/default.profile =================================================================== RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v retrieving revision 1.30 diff -u -p -r1.30 default.profile --- ./profiles/default/default.profile 8 Oct 2008 03:27:56 -0000 1.30 +++ ./profiles/default/default.profile 21 Oct 2008 02:57:25 -0000 @@ -155,6 +155,8 @@ function default_profile_tasks(&$task, $ menu_link_save($link); $link = array('link_path' => 'admin/build/menu-customize/secondary-menu/add', 'link_title' => 'Add a secondary menu link', 'menu_name' => 'secondary-menu'); menu_link_save($link); + $link = array('link_path' => 'admin/content/node', 'link_title' => 'My content', 'menu_name' => 'navigation', 'plid' => 0, 'weight' => '3'); + menu_link_save($link); } /**