Skip to content

bugzilla
bugzilla
Commit 89b2fc2a authored by Frédéric Buclin's avatar Frédéric Buclin
Browse files
Options

Bug 616192: Display personal tags in buglists

r=timello a=LpSolit
parent 51bca2fc
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 63 deletions
Bugzilla/Field.pm
View file @ 89b2fc2a
...@@ -248,7 +248,7 @@ use constant DEFAULT_FIELDS => ( ...@@ -248,7 +248,7 @@ use constant DEFAULT_FIELDS => (
{name => "owner_idle_time", desc => "Time Since Assignee Touched"}, {name => "owner_idle_time", desc => "Time Since Assignee Touched"},
{name => 'see_also', desc => "See Also", {name => 'see_also', desc => "See Also",
type => FIELD_TYPE_BUG_URLS}, type => FIELD_TYPE_BUG_URLS},
{name => 'tag', desc => 'Tags'}, {name => 'tag', desc => 'Tags', buglist => 1},
); );
################ ################
......
Bugzilla/Search.pm
View file @ 89b2fc2a
...@@ -397,71 +397,88 @@ use constant COLUMN_DEPENDS => { ...@@ -397,71 +397,88 @@ use constant COLUMN_DEPENDS => {
# certain columns in the buglist. For the most part, Search.pm uses # certain columns in the buglist. For the most part, Search.pm uses
# DB::Schema to figure out what needs to be joined, but for some # DB::Schema to figure out what needs to be joined, but for some
# fields it needs a little help. # fields it needs a little help.
use constant COLUMN_JOINS => { sub COLUMN_JOINS {
actual_time => { my $invocant = shift;
table => '(SELECT bug_id, SUM(work_time) AS total' my $user = blessed($invocant) ? $invocant->_user : Bugzilla->user;
. ' FROM longdescs GROUP BY bug_id)',
join => 'INNER', my $joins = {
}, actual_time => {
assigned_to => { table => '(SELECT bug_id, SUM(work_time) AS total'
from => 'assigned_to', . ' FROM longdescs GROUP BY bug_id)',
to => 'userid', join => 'INNER',
table => 'profiles', },
join => 'INNER', assigned_to => {
}, from => 'assigned_to',
reporter => { to => 'userid',
from => 'reporter', table => 'profiles',
to => 'userid', join => 'INNER',
table => 'profiles', },
join => 'INNER', reporter => {
}, from => 'reporter',
qa_contact => { to => 'userid',
from => 'qa_contact', table => 'profiles',
to => 'userid', join => 'INNER',
table => 'profiles', },
}, qa_contact => {
component => { from => 'qa_contact',
from => 'component_id', to => 'userid',
to => 'id', table => 'profiles',
table => 'components', },
join => 'INNER', component => {
}, from => 'component_id',
product => {
from => 'product_id',
to => 'id',
table => 'products',
join => 'INNER',
},
classification => {
table => 'classifications',
from => 'map_product.classification_id',
to => 'id',
join => 'INNER',
},
'flagtypes.name' => {
as => 'map_flags',
table => 'flags',
extra => ['map_flags.attach_id IS NULL'],
then_to => {
as => 'map_flagtypes',
table => 'flagtypes',
from => 'map_flags.type_id',
to => 'id', to => 'id',
table => 'components',
join => 'INNER',
}, },
}, product => {
keywords => { from => 'product_id',
table => 'keywords',
then_to => {
as => 'map_keyworddefs',
table => 'keyworddefs',
from => 'map_keywords.keywordid',
to => 'id', to => 'id',
table => 'products',
join => 'INNER',
}, },
}, classification => {
'longdescs.count' => { table => 'classifications',
table => 'longdescs', from => 'map_product.classification_id',
join => 'INNER', to => 'id',
}, join => 'INNER',
},
'flagtypes.name' => {
as => 'map_flags',
table => 'flags',
extra => ['map_flags.attach_id IS NULL'],
then_to => {
as => 'map_flagtypes',
table => 'flagtypes',
from => 'map_flags.type_id',
to => 'id',
},
},
keywords => {
table => 'keywords',
then_to => {
as => 'map_keyworddefs',
table => 'keyworddefs',
from => 'map_keywords.keywordid',
to => 'id',
},
},
'longdescs.count' => {
table => 'longdescs',
join => 'INNER',
},
tag => {
as => 'map_bug_tag',
table => 'bug_tag',
then_to => {
as => 'map_tag',
table => 'tag',
extra => ['map_tag.user_id = ' . $user->id],
from => 'map_bug_tag.tag_id',
to => 'id',
},
}
};
return $joins;
}; };
# This constant defines the columns that can be selected in a query # This constant defines the columns that can be selected in a query
...@@ -527,6 +544,8 @@ sub COLUMNS { ...@@ -527,6 +544,8 @@ sub COLUMNS {
'keywords' => $dbh->sql_group_concat('DISTINCT map_keyworddefs.name'), 'keywords' => $dbh->sql_group_concat('DISTINCT map_keyworddefs.name'),
'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)', 'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)',
tag => $dbh->sql_group_concat($dbh->sql_string_concat('map_tag.name')),
); );
# Backward-compatibility for old field names. Goes new_name => old_name. # Backward-compatibility for old field names. Goes new_name => old_name.
...@@ -1816,7 +1835,7 @@ sub _get_column_joins { ...@@ -1816,7 +1835,7 @@ sub _get_column_joins {
return $cache->{column_joins} if defined $cache->{column_joins}; return $cache->{column_joins} if defined $cache->{column_joins};
my %column_joins = %{ COLUMN_JOINS() }; my %column_joins = %{ $self->COLUMN_JOINS() };
Bugzilla::Hook::process('buglist_column_joins', Bugzilla::Hook::process('buglist_column_joins',
{ column_joins => \%column_joins }); { column_joins => \%column_joins });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment