summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/FlagType.pm43
-rwxr-xr-xeditflagtypes.cgi4
-rw-r--r--template/en/default/admin/flag-type/edit.html.tmpl1
-rw-r--r--template/en/default/global/messages.html.tmpl3
4 files changed, 40 insertions, 11 deletions
diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index b48c7023c..d6a122609 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -132,10 +132,29 @@ sub create {
sub update {
my $self = shift;
my $dbh = Bugzilla->dbh;
+ my $flag_id = $self->id;
$dbh->bz_start_transaction();
my $changes = $self->SUPER::update(@_);
+ # Update the flaginclusions and flagexclusions tables.
+ foreach my $category ('inclusions', 'exclusions') {
+ next unless delete $self->{"_update_$category"};
+
+ $dbh->do("DELETE FROM flag$category WHERE type_id = ?", undef, $flag_id);
+
+ my $sth = $dbh->prepare("INSERT INTO flag$category
+ (type_id, product_id, component_id) VALUES (?, ?, ?)");
+
+ foreach my $prod_comp (values %{$self->{$category}}) {
+ my ($prod_id, $comp_id) = split(':', $prod_comp);
+ $prod_id ||= undef;
+ $comp_id ||= undef;
+ $sth->execute($flag_id, $prod_id, $comp_id);
+ }
+ $changes->{$category} = [0, 1];
+ }
+
# Clear existing flags for bugs/attachments in categories no longer on
# the list of inclusions or that have been added to the list of exclusions.
my $flag_ids = $dbh->selectcol_arrayref('SELECT DISTINCT flags.id
@@ -333,17 +352,15 @@ sub set_request_group { $_[0]->set('request_group_id', $_[1]); }
sub set_clusions {
my ($self, $list) = @_;
my $dbh = Bugzilla->dbh;
- my $flag_id = $self->id;
my %products;
foreach my $category (keys %$list) {
- my $sth = $dbh->prepare("INSERT INTO flag$category
- (type_id, product_id, component_id) VALUES (?, ?, ?)");
-
- $dbh->do("DELETE FROM flag$category WHERE type_id = ?", undef, $flag_id);
+ my %clusions;
+ my %clusions_as_hash;
foreach my $prod_comp (@{$list->{$category} || []}) {
my ($prod_id, $comp_id) = split(':', $prod_comp);
+ my $component;
# Does the product exist?
if ($prod_id && detaint_natural($prod_id)) {
$products{$prod_id} ||= new Bugzilla::Product($prod_id);
@@ -351,14 +368,20 @@ sub set_clusions {
# Does the component belong to this product?
if ($comp_id && detaint_natural($comp_id)) {
- my $found = grep { $_->id == $comp_id } @{$products{$prod_id}->components};
- next unless $found;
+ ($component) = grep { $_->id == $comp_id } @{$products{$prod_id}->components};
+ next unless $component;
}
}
- $prod_id ||= undef;
- $comp_id ||= undef;
- $sth->execute($flag_id, $prod_id, $comp_id);
+ $prod_id ||= 0;
+ $comp_id ||= 0;
+ my $prod_name = $prod_id ? $products{$prod_id}->name : '__Any__';
+ my $comp_name = $comp_id ? $component->name : '__Any__';
+ $clusions{"$prod_name:$comp_name"} = "$prod_id:$comp_id";
+ $clusions_as_hash{$prod_id}->{$comp_id} = 1;
}
+ $self->{$category} = \%clusions;
+ $self->{"${category}_as_hash"} = \%clusions_as_hash;
+ $self->{"_update_$category"} = 1;
}
}
diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index e2b8ba12c..3e3f94f2e 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -126,6 +126,7 @@ if (my ($category_action) = grep { $_ =~ /^categoryAction-(?:\w+)$/ } $cgi->para
$type->{'exclusions'} = \%exclusions;
$vars->{'type'} = $type;
$vars->{'token'} = $token;
+ $vars->{'check_clusions'} = 1;
$template->process("admin/flag-type/edit.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@@ -305,7 +306,8 @@ if ($action eq 'update') {
$flagtype->set_is_multiplicable($is_multiplicable);
$flagtype->set_grant_group($grant_group);
$flagtype->set_request_group($request_group);
- $flagtype->set_clusions({ inclusions => \@inclusions, exclusions => \@exclusions});
+ $flagtype->set_clusions({ inclusions => \@inclusions, exclusions => \@exclusions})
+ if $cgi->param('check_clusions');
my $changes = $flagtype->update();
delete_token($token);
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 88c92b4e3..eb0211377 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -52,6 +52,7 @@
<input type="hidden" name="id" value="[% type.id %]">
<input type="hidden" name="token" value="[% token FILTER html %]">
<input type="hidden" name="target_type" value="[% type.target_type FILTER html %]">
+ <input type="hidden" name="check_clusions" value="[% check_clusions FILTER none %]">
[% FOREACH category = type.inclusions %]
<input type="hidden" name="inclusions" value="[% category.value FILTER html %]">
[% END %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index a4b6cdef3..b68ecdc5c 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -645,6 +645,9 @@
<li>Request group deleted</li>
[% END %]
[% END %]
+ [% IF changes.inclusions.defined || changes.exclusions.defined %]
+ <li>The inclusions and exclusions lists have been updated</li>
+ [% END %]
</ul>
[% ELSE %]
No changes made to file type <em>[% flagtype.name FILTER html %]</em>.