=== modified file 'sites/all/modules/drupalorg/drupalorg/drupalorg.module' --- sites/all/modules/drupalorg/drupalorg/drupalorg.module 2011-07-22 20:55:24 +0000 +++ sites/all/modules/drupalorg/drupalorg/drupalorg.module 2011-09-10 04:12:49 +0000 @@ -906,7 +906,6 @@ // List of forms to check for overrides, and the corresponding permissions. $override_forms = array( - 'book_node_form' => 'revert revisions', 'forum_node_form' => 'administer nodes', 'page_node_form' => 'administer nodes', 'story_node_form' => 'administer nodes', === modified file 'sites/all/modules/drupalorg/drupalorg_crosssite/drupalorg_crosssite.module' --- sites/all/modules/drupalorg/drupalorg_crosssite/drupalorg_crosssite.module 2011-07-12 22:14:53 +0000 +++ sites/all/modules/drupalorg/drupalorg_crosssite/drupalorg_crosssite.module 2011-08-07 00:55:47 +0000 @@ -668,7 +668,8 @@ 'module' => t('Modules'), 'theme' => t('Themes'), 'documentation' => t('Documentation'), - 'forum-issues' => t('Forums & Issues'), + 'forum' => t('Forums'), + 'issue' => t('Issues'), 'group' => t('Groups'), ); } @@ -755,8 +756,8 @@ ), ), 'book' => 'documentation', - 'project_issue' => 'forum-issues', - 'forum' => 'forum-issues', + 'project_issue' => 'issue', + 'forum' => 'forum', 'og' => 'group', // Map the session from chicago2011.drupal.org to the 'documentation' metatype 'session' => 'documentation', === modified file 'sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.module' --- sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.module 2011-07-15 22:29:04 +0000 +++ sites/all/modules/drupalorg/drupalorg_project/drupalorg_project.module 2011-09-10 08:17:50 +0000 @@ -200,6 +200,7 @@ $issue_counts[$version]['Patch queue'] = db_result(db_query("SELECT COUNT(*) FROM {project_issues} pi INNER JOIN {node} n ON pi.nid = n.nid WHERE n.status = 1 AND pid = %d AND sid IN (8,13,14) AND rid IN ($issue_rid_placeholders)", $args)); $issue_counts[$version]['Pending bugs'] = db_result(db_query("SELECT COUNT(*) FROM {project_issues} pi INNER JOIN {node} n ON pi.nid = n.nid WHERE n.status = 1 AND pid = %d AND category = 'bug' AND sid IN(1,8,13,14,15) AND rid IN ($issue_rid_placeholders)", $args)); } + $issue_counts['Novice issues'] = db_result(db_query("SELECT COUNT(*) FROM {project_issues} pi INNER JOIN {term_node} tn ON pi.nid = tn.nid INNER JOIN {term_data} td on tn.tid = td.tid WHERE td.name = '%s' AND sid IN (1,2,8,13,14,15))", "Novice")); variable_set('drupalorg_project_issue_counts', $issue_counts); } @@ -524,7 +525,7 @@ * @param $text * String to use as text for the link. * @param $query - * A keyed array of options to pass to the query parameter of l(). + * A keyed array of options to pass to the query parameter of l(). * - version (An array of release node IDs) * - status (An array of status IDs) * - priorities (An array of priority IDs) @@ -532,10 +533,28 @@ * @param $absolute * Set to TRUE to get an absolute URL with http://drupal.org/... */ -function drupalorg_project_issue_link($text, $query = array(), $absolute = FALSE) { +function drupalorg_project_core_issue_link($text, $query = array(), $absolute = FALSE) { return l($text, 'project/issues/search/drupal', array('query' => $query, 'absolute' => $absolute)); } +/** + * Project issue link generator for all issues. + * + * @param $text + * String to use as text for the link. + * @param $query + * A keyed array of options to pass to the query parameter of l(). + * - version (An array of release node IDs) + * - status (An array of status IDs) + * - priorities (An array of priority IDs) + * - categories (An array of category names) + * @param $absolute + * Set to TRUE to get an absolute URL with http://drupal.org/... + */ +function drupalorg_project_global_issue_link($text, $query = array(), $absolute = FALSE) { + return l($text, 'project/issues/search', array('query' => $query, 'absolute' => $absolute)); +} + // == Node overrides =========================================================== /** @@ -773,6 +792,7 @@ $counts_major_tasks = $counts['both']['Major tasks']; $counts_pending_bugs = $counts['both']['Pending bugs']; $counts_queue = $counts[DRUPALORG_CORE_DEVELOPMENT_VERSION_TID]['Patch queue']; + $counts_novice = $counts['Novice issues']; $links = array( l('Community initiatives', 'community-initiatives'), @@ -780,7 +800,15 @@ 'data' => 'Queues', 'children' => array( l('Your issues', 'project/issues/user'), - drupalorg_project_issue_link( + drupalorg_project_global_issue_link( + $counts_novice . t(' Novice issues'), + array( + 'status' => array(1, 2, 8, 13, 14, 15), + 'issue_tags_op' => array('or'), + 'issue_tags' => array('Novice'), + ) + ), + drupalorg_project_core_issue_link( $counts_critical_bugs .' Critical bugs (D8 + D7)', array( 'version' => $versions, @@ -789,7 +817,7 @@ 'categories' => array('bug'), ) ), - drupalorg_project_issue_link( + drupalorg_project_core_issue_link( $counts_major_bugs .' Major bugs (D8 + D7)', array( 'version' => $versions, @@ -798,7 +826,7 @@ 'categories' => array('bug'), ) ), - drupalorg_project_issue_link( + drupalorg_project_core_issue_link( $counts_critical_tasks .' Critical tasks (D8 + D7)', array( 'version' => $versions, @@ -807,7 +835,7 @@ 'categories' => array('task'), ) ), - drupalorg_project_issue_link( + drupalorg_project_core_issue_link( $counts_major_tasks .' Major tasks (D8 + D7)', array( 'version' => $versions, @@ -816,7 +844,7 @@ 'categories' => array('task'), ) ), - drupalorg_project_issue_link( + drupalorg_project_core_issue_link( $counts_pending_bugs .' Pending bugs (D8 + D7)', array( 'version' => $versions, @@ -824,14 +852,14 @@ 'categories' => array('bug'), ) ), - drupalorg_project_issue_link( + drupalorg_project_core_issue_link( $counts_queue .' Patch queue (D8)', array( 'version' => array(DRUPALORG_CORE_DEVELOPMENT_VERSION_NAME), 'status' => array(8, 13, 14), ) ), - drupalorg_project_issue_link( + drupalorg_project_core_issue_link( 'Issues needing triage', array( 'version' => $versions, === modified file 'sites/all/modules/project/release/project_release.module' --- sites/all/modules/project/release/project_release.module 2011-06-04 23:31:42 +0000 +++ sites/all/modules/project/release/project_release.module 2011-09-09 00:12:47 +0000 @@ -39,8 +39,8 @@ 'title' => 'Releases', 'page callback' => 'project_release_project_edit_releases', 'page arguments' => array(1), - 'access callback' => 'project_release_project_settings_form_access', - 'access arguments' => array(1), + 'access callback' => 'project_user_access', + 'access arguments' => array(1, 'administer releases'), 'type' => MENU_LOCAL_TASK, 'file' => 'includes/project_edit_releases.inc', ); @@ -89,18 +89,6 @@ } /** - * Access callback for node/%project_node/edit/releases subtab. - */ -function project_release_project_settings_form_access($node) { - if (!variable_get('project_release_sandbox_allow_release', TRUE) && $node->project['sandbox'] && $node->project_release['releases'] == 0) { - return FALSE; - } - else { - return project_user_access($node, 'administer releases'); - } -} - -/** * @defgroup project_release_node Drupal node-type related hooks */ @@ -1038,8 +1026,7 @@ * Insert release information about a project node. */ function project_release_project_nodeapi_insert(&$node) { - $releases = (!variable_get('project_release_sandbox_allow_release', TRUE) && $node->project['sandbox']) ? 0 : 1; - db_query("INSERT INTO {project_release_projects} (nid, releases, version_format) VALUES (%d, %d, '%s')", $node->nid, $releases, ''); + db_query("INSERT INTO {project_release_projects} (nid, releases, version_format) VALUES (%d, %d, '%s')", $node->nid, 1, ''); } /**