Index: project_issue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.module,v
retrieving revision 1.142
diff -u -p -u -p -r1.142 project_issue.module
--- project_issue.module 20 Feb 2009 23:31:11 -0000 1.142
+++ project_issue.module 22 Feb 2009 08:27:37 -0000
@@ -255,7 +255,7 @@ function project_issue_help($path, $arg)
// and render these links in here. We'd like to remove this once a
// better solution is available that doesn't hard-code the paths.
if ($arg[0] == 'project' && $arg[1] == 'user') {
- return project_issue_my_projects_table();
+ return project_issue_my_projects_table($arg);
}
if ($arg[0] == 'project' && $arg[1] == 'issues') {
@@ -1008,7 +1008,7 @@ function project_issue_rewrite_issue_fil
}
}
-function project_issue_my_projects_table() {
+function project_issue_my_projects_table($arg = array()) {
$uid = 0;
$display = views_get_page_view();
if (!empty($display->view->argument['uid'])) {
@@ -1138,7 +1138,12 @@ function project_issue_my_projects_table
if ($any_admin) {
$header[] = array('data' => t('Project links'), 'class' => 'project-project-links');
}
- return theme('table', $header, $rows, array('class' => 'projects'));
+ $output = theme('table', $header, $rows, array('class' => 'projects'));
+ if ($arg[3] != 'search') {
+ $user_arg = !empty($arg[2]) ? $arg[2] : $uid;
+ $output .= ''. l(t('Advanced search'), "project/user/$user_arg/search") . '
';
+ }
+ return $output;
}
/**
@@ -1612,6 +1617,7 @@ function project_issue_quick_navigate_ti
function project_issue_alter_views_exposed_form(&$form, &$form_state) {
switch ($form_state['view']->name) {
+ case 'project_issue_user_project_adv':
case 'project_issue_search_all':
case 'project_issue_search_project':
$user_filters = array('assigned', 'submitted', 'participant');
Index: views/project_issue.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/views/project_issue.views_default.inc,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 project_issue.views_default.inc
--- views/project_issue.views_default.inc 22 Feb 2009 00:31:32 -0000 1.36
+++ views/project_issue.views_default.inc 22 Feb 2009 08:27:39 -0000
@@ -1619,6 +1619,434 @@ function project_issue_views_default_vie
$views[$view->name] = $view;
+ // ------------------------------------------------------------
+ // Issues across all projects owned by a user (advanced search)
+ // ------------------------------------------------------------
+
+ $view = new view;
+ $view->name = 'project_issue_user_project_adv';
+ $view->description = "Project issues for a specific user's projects (advanced search)";
+ $view->tag = 'Project issue';
+ $view->view_php = '';
+ $view->base_table = 'node';
+ $view->is_cacheable = FALSE;
+ $view->api_version = 2;
+ $view->disabled = FALSE;
+ $handler = $view->new_display('default', 'Defaults', 'default');
+ $handler->override_option('relationships', array(
+ 'assigned' => array(
+ 'label' => 'Assigned user',
+ 'required' => 1,
+ 'id' => 'assigned',
+ 'table' => 'project_issues',
+ 'field' => 'assigned',
+ 'relationship' => 'none',
+ ),
+ 'rid' => array(
+ 'label' => 'Version',
+ 'required' => 0,
+ 'id' => 'rid',
+ 'table' => 'project_issues',
+ 'field' => 'rid',
+ 'relationship' => 'none',
+ ),
+ 'pid' => array(
+ 'label' => 'Project node',
+ 'required' => 1,
+ 'id' => 'pid',
+ 'table' => 'project_issues',
+ 'field' => 'pid',
+ ),
+ ));
+ $handler->override_option('fields', array(
+ 'project_issue_queue' => array(
+ 'label' => 'Project',
+ 'link_type' => 'issues',
+ 'exclude' => 0,
+ 'id' => 'project_issue_queue',
+ 'table' => 'node',
+ 'field' => 'project_issue_queue',
+ 'relationship' => 'pid',
+ ),
+ 'title' => array(
+ 'label' => 'Summary',
+ 'link_to_node' => 1,
+ 'exclude' => 0,
+ 'id' => 'title',
+ 'table' => 'node',
+ 'field' => 'title',
+ 'relationship' => 'none',
+ ),
+ 'timestamp' => array(
+ 'label' => '',
+ 'alter' => array(),
+ 'link_to_node' => 0,
+ 'comments' => 0,
+ 'exclude' => 0,
+ 'id' => 'timestamp',
+ 'table' => 'history_user',
+ 'field' => 'timestamp',
+ 'relationship' => 'none',
+ ),
+ 'sid' => array(
+ 'id' => 'sid',
+ 'table' => 'project_issues',
+ 'field' => 'sid',
+ ),
+ 'priority' => array(
+ 'id' => 'priority',
+ 'table' => 'project_issues',
+ 'field' => 'priority',
+ ),
+ 'category' => array(
+ 'label' => 'Category',
+ 'link_to_node' => 0,
+ 'exclude' => 0,
+ 'id' => 'category',
+ 'table' => 'project_issues',
+ 'field' => 'category',
+ 'relationship' => 'none',
+ ),
+ 'version' => array(
+ 'label' => 'Version',
+ 'link_to_node' => 0,
+ 'exclude' => 0,
+ 'id' => 'version',
+ 'table' => 'project_release_nodes',
+ 'field' => 'version',
+ 'relationship' => 'rid',
+ ),
+ 'comment_count' => array(
+ 'label' => 'Replies',
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'exclude' => 0,
+ 'id' => 'comment_count',
+ 'table' => 'node_comment_statistics',
+ 'field' => 'comment_count',
+ 'relationship' => 'none',
+ ),
+ 'new_comments' => array(
+ 'label' => '',
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => ' new',
+ 'link_to_comment' => 1,
+ 'no_empty' => 1,
+ 'exclude' => 0,
+ 'id' => 'new_comments',
+ 'table' => 'node',
+ 'field' => 'new_comments',
+ 'relationship' => 'none',
+ ),
+ 'last_comment_timestamp' => array(
+ 'label' => 'Last updated',
+ 'date_format' => 'raw time ago',
+ 'custom_date_format' => '',
+ 'exclude' => 0,
+ 'id' => 'last_comment_timestamp',
+ 'table' => 'node_comment_statistics',
+ 'field' => 'last_comment_timestamp',
+ 'relationship' => 'none',
+ ),
+ 'name' => array(
+ 'label' => 'Assigned to',
+ 'link_to_user' => 1,
+ 'overwrite_anonymous' => 1,
+ 'anonymous_text' => '',
+ 'exclude' => 0,
+ 'id' => 'name',
+ 'table' => 'users',
+ 'field' => 'name',
+ 'relationship' => 'assigned',
+ ),
+ ));
+ $handler->override_option('sorts', array(
+ 'last_comment_timestamp' => array(
+ 'order' => 'DESC',
+ 'granularity' => 'second',
+ 'id' => 'last_comment_timestamp',
+ 'table' => 'node_comment_statistics',
+ 'field' => 'last_comment_timestamp',
+ 'relationship' => 'none',
+ ),
+ ));
+ $handler->override_option('arguments', array(
+ 'uid' => array(
+ 'default_action' => 'default',
+ 'style_plugin' => 'default_summary',
+ 'style_options' => array(),
+ 'wildcard' => 'all',
+ 'wildcard_substitution' => 'All',
+ 'title' => 'Projects by %1 (advanced search)',
+ 'default_argument_type' => 'current_user',
+ 'default_argument' => '',
+ 'validate_type' => 'user',
+ 'validate_fail' => 'not found',
+ 'break_phrase' => 0,
+ 'not' => 0,
+ 'id' => 'uid',
+ 'table' => 'users',
+ 'field' => 'uid',
+ 'relationship' => 'pid',
+ 'default_options_div_prefix' => '',
+ 'default_argument_user' => 0,
+ 'default_argument_fixed' => '',
+ 'default_argument_php' => '',
+ 'validate_user_argument_type' => 'either',
+ 'validate_user_restrict_roles' => 1,
+ 'validate_user_roles' => array('2' => 2),
+ ),
+ ));
+ $filters = array(
+ 'status_extra' => array(
+ 'operator' => '=',
+ 'value' => '',
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
+ ),
+ 'id' => 'status_extra',
+ 'table' => 'node',
+ 'field' => 'status_extra',
+ 'relationship' => 'none',
+ ),
+ 'pid' => array(
+ 'operator' => 'in',
+ 'value' => '',
+ 'group' => '0',
+ 'exposed' => TRUE,
+ 'expose' => array(
+ 'operator' => 'pid_op',
+ 'label' => 'Project',
+ 'use_operator' => 0,
+ 'identifier' => 'projects',
+ 'optional' => 1,
+ 'single' => 0,
+ 'remember' => 0,
+ 'reduce' => 0,
+ ),
+ 'widget' => 'select',
+ 'project_source' => 'owner',
+ 'project_uid_argument' => 'uid',
+ 'id' => 'pid',
+ 'table' => 'project_issues',
+ 'field' => 'pid',
+ 'relationship' => 'none',
+ ),
+ 'sid' => array(
+ 'operator' => 'in',
+ 'value' => array(
+ 'open' => 'open',
+ ),
+ 'group' => '0',
+ 'exposed' => TRUE,
+ 'expose' => array(
+ 'use_operator' => 0,
+ 'operator' => 'sid_op',
+ 'identifier' => 'status',
+ 'label' => 'Status',
+ 'optional' => 1,
+ 'single' => 0,
+ 'remember' => 0,
+ 'reduce' => 0,
+ ),
+ 'id' => 'sid',
+ 'table' => 'project_issues',
+ 'field' => 'sid',
+ 'relationship' => 'none',
+ ),
+ 'priority' => array(
+ 'operator' => 'in',
+ 'value' => array(),
+ 'group' => '0',
+ 'exposed' => TRUE,
+ 'expose' => array(
+ 'use_operator' => 0,
+ 'operator' => 'priority_op',
+ 'identifier' => 'priorities',
+ 'label' => 'Priority',
+ 'optional' => 1,
+ 'single' => 0,
+ 'remember' => 0,
+ 'reduce' => 0,
+ ),
+ 'id' => 'priority',
+ 'table' => 'project_issues',
+ 'field' => 'priority',
+ 'relationship' => 'none',
+ ),
+ 'category' => array(
+ 'operator' => 'in',
+ 'value' => array(),
+ 'group' => '0',
+ 'exposed' => TRUE,
+ 'expose' => array(
+ 'use_operator' => 0,
+ 'operator' => 'category_op',
+ 'identifier' => 'categories',
+ 'label' => 'Category',
+ 'optional' => 1,
+ 'single' => 0,
+ 'remember' => 0,
+ 'reduce' => 0,
+ ),
+ 'id' => 'category',
+ 'table' => 'project_issues',
+ 'field' => 'category',
+ 'relationship' => 'none',
+ ),
+ );
+ if (module_exists('search')) {
+ $filters['keys'] = array(
+ 'operator' => 'required',
+ 'value' => '',
+ 'group' => '0',
+ 'exposed' => TRUE,
+ 'expose' => array(
+ 'use_operator' => 0,
+ 'operator' => 'keys_op',
+ 'identifier' => 'text',
+ 'label' => 'Search for',
+ 'optional' => 1,
+ 'remember' => 0,
+ ),
+ 'id' => 'keys',
+ 'table' => 'search_index',
+ 'field' => 'keys',
+ 'relationship' => 'none',
+ );
+ }
+ $handler->override_option('filters', $filters);
+ $handler->override_option('access', array(
+ 'type' => 'none',
+ ));
+ $handler->override_option('empty', 'No issues match your criteria.');
+ $handler->override_option('empty_format', '1');
+ $handler->override_option('items_per_page', 50);
+ $handler->override_option('use_pager', '1');
+ $handler->override_option('style_plugin', 'project_issue_table');
+ $handler->override_option('style_options', array(
+ 'grouping' => '',
+ 'override' => 1,
+ 'sticky' => 1,
+ 'order' => 'desc',
+ 'columns' => array(
+ 'project_issue_queue' => 'project_issue_queue',
+ 'title' => 'title',
+ 'timestamp' => 'title',
+ 'sid' => 'sid',
+ 'priority' => 'priority',
+ 'category' => 'category',
+ 'version' => 'version',
+ 'comment_count' => 'comment_count',
+ 'new_comments' => 'comment_count',
+ 'last_comment_timestamp' => 'last_comment_timestamp',
+ 'name' => 'name',
+ ),
+ 'info' => array(
+ 'project_issue_queue' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'title' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'timestamp' => array(
+ 'separator' => '',
+ ),
+ 'sid' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'priority' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'category' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'version' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'comment_count' => array(
+ 'sortable' => 1,
+ 'separator' => '
',
+ ),
+ 'new_comments' => array(
+ 'separator' => '',
+ ),
+ 'last_comment_timestamp' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ 'name' => array(
+ 'sortable' => 1,
+ 'separator' => '',
+ ),
+ ),
+ 'default' => 'last_comment_timestamp',
+ ));
+ $handler = $view->new_display('page', 'Page', 'page_1');
+ $handler->override_option('path', 'project/user/%/search');
+ $handler->override_option('menu', array(
+ 'type' => 'normal',
+ 'title' => 'Advanced search',
+ 'description' => '',
+ 'weight' => '0',
+ 'name' => 'navigation',
+ ));
+ $handler->override_option('tab_options', array(
+ 'type' => 'none',
+ 'title' => '',
+ 'description' => '',
+ 'weight' => 0,
+ ));
+ $handler = $view->new_display('feed', 'Feed', 'feed_1');
+ $handler->override_option('style_plugin', 'rss');
+ $handler->override_option('style_options', array(
+ 'mission_description' => FALSE,
+ 'description' => '',
+ ));
+ $handler->override_option('row_plugin', 'node_rss');
+ $handler->override_option('row_options', array(
+ 'item_length' => 'default',
+ ));
+ $handler->override_option('path', 'project/user/%/search/feed');
+ $handler->override_option('menu', array(
+ 'type' => 'none',
+ 'title' => '',
+ 'description' => '',
+ 'weight' => 0,
+ 'name' => 'navigation',
+ ));
+ $handler->override_option('tab_options', array(
+ 'type' => 'none',
+ 'title' => '',
+ 'description' => '',
+ 'weight' => 0,
+ ));
+ $handler->override_option('displays', array(
+ 'page_1' => 'page_1',
+ 'default' => 0,
+ ));
+ $handler->override_option('sitename_title', FALSE);
+
+ $views[$view->name] = $view;
+
+
// ------------------------------------------
// Advanced issue search for all projects
// ------------------------------------------