Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 638509 - Make all boolean charts work with all attachment fields except

Browse Source 
for "Attachment data"
r=mkanat, a=mkanat (module owner)


git-svn-id: svn://10.0.0.236/trunk@261995 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2011-03-03 19:31:53 +00:00
parent 19a96028b8
commit 9ff40283cf
3 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/webtools/bugzilla/Bugzilla/Search.pm
View File

@@ -271,11 +271,9 @@ use constant OPERATOR_FIELD_OVERRIDE => {
_non_changed => \&_attach_data_thedata,
},
# We check all attachment fields against this.
'attachments' => {
_non_changed => \&_attachments,
},
blocked => MULTI_SELECT_OVERRIDE,
bug_group => MULTI_SELECT_OVERRIDE,
attachments => MULTI_SELECT_OVERRIDE,
blocked => MULTI_SELECT_OVERRIDE,
bug_group => MULTI_SELECT_OVERRIDE,
classification => {
_non_changed => \&_classification_nonchanged,
},
@@ -2351,26 +2349,6 @@ sub _attach_data_thedata {
$args->{full_field} = "$data_table.thedata";
}
sub _attachments {
my ($self, $args) = @_;
my ($chart_id, $joins, $field) =
@$args{qw(chart_id joins field)};
my $dbh = Bugzilla->dbh;
my $table = "attachments_$chart_id";
my $extra = $self->_user->is_insider ? [] : ["$table.isprivate = 0"];
my $join = {
table => 'attachments',
as => $table,
extra => $extra,
};
push(@$joins, $join);
$field =~ /^attachments\.(.+)$/;
my $attach_field = $1;
$args->{full_field} = "$table.$attach_field";
}
sub _join_flag_tables {
my ($self, $args) = @_;
my ($joins, $chart_id) = @$args{qw(joins chart_id)};
@@ -2616,6 +2594,13 @@ sub _multiselect_table {
$args->{full_field} = 'isprivate';
return "longdescs";
}
elsif ($field =~ /^attachments/) {
$args->{_extra_where} = " AND isprivate = 0"
if !$self->_user->is_insider;
$field =~ /^attachments\.(.+)$/;
$args->{full_field} = $1;
return "attachments";
}
my $table = "bug_$field";
$args->{full_field} = "bug_$field.value";
return $table;