vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Make update_control_lists report changes

hinted-selects
Vitaliy Filippov 2014-08-18 20:07:40 +04:00
parent 715d373356
commit 810df2568a
7 changed files with 77 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Bugzilla/Field.pm
View File

@ -383,7 +383,7 @@ sub _check_default_value
# Array of IDs
$value = [ $value ] if !ref $value;
detaint_natural($_) for @$value;
$value = @$value ? join(',', @$value) : undef;
$value = @$value ? join(',', sort @$value) : undef;
}
elsif ($self->type == FIELD_TYPE_BUG_ID_REV)
{
@ -1005,7 +1005,6 @@ sub update_visibility_values
return 1;
}
# FIXME: Make this function report saved changes
sub update_control_lists
{
my $self = shift;
@ -1014,17 +1013,22 @@ sub update_control_lists
$controlling_value_id = $controlling_value_id ? $controlling_value_id->id : return undef;
# Save all visible, nullable and clone flags at once
my $mod = { del => [], add => [] };
for my $f (Bugzilla->get_fields({ obsolete => 0, visibility_field_id => $self->id }))
my $rpt = {};
my $h = Bugzilla->fieldvaluecontrol->{$self->id};
for my $flag ([ 'visibility_field_id', 'is_visible', 'fields', FLAG_VISIBLE ],
[ 'null_field_id', 'is_nullable', 'null', FLAG_NULLABLE ],
[ 'clone_field_id', 'is_cloned', 'clone', FLAG_CLONED ])
{
push @{$mod->{$params->{'is_visible_'.$f->name} ? 'add' : 'del'}}, [ $f->id, FLAG_VISIBLE ];
}
for my $f (Bugzilla->get_fields({ obsolete => 0, null_field_id => $self->id }))
{
push @{$mod->{$params->{'is_nullable_'.$f->name} ? 'add' : 'del'}}, [ $f->id, FLAG_NULLABLE ];
}
for my $f (Bugzilla->get_fields({ obsolete => 0, clone_field_id => $self->id }))
{
push @{$mod->{$params->{'is_cloned_'.$f->name} ? 'add' : 'del'}}, [ $f->id, FLAG_CLONED ];
for my $f (Bugzilla->get_fields({ obsolete => 0, $flag->[0] => $self->id }))
{
if ((1 && $params->{$flag->[1].'_'.$f->name}) != ($h->{$flag->[2]} &&
$h->{$flag->[2]}->{$f->id} && $h->{$flag->[2]}->{$f->id}->{$controlling_value_id}))
{
my $ad = $params->{$flag->[1].'_'.$f->name} ? 'add' : 'del';
push @{$rpt->{$ad.'_'.$flag->[1]}}, $f->id;
push @{$mod->{$ad}}, [ $f->id, $flag->[3] ];
}
}
}
if (@{$mod->{del}} || @{$mod->{add}})
{
@ -1043,36 +1047,40 @@ sub update_control_lists
}
# Save all dependent defaults at once
my $touched = { map { $_->[0] => 1 } (@{$mod->{add}}, @{$mod->{del}}) };
$mod = { del => [], add => [] };
my $def = { del => [], add => [] };
$h = Bugzilla->fieldvaluecontrol->{$self->id}->{defaults};
for my $f (Bugzilla->get_fields({ obsolete => 0, default_field_id => $self->id }))
{
my $default = $params->{'default_'.$f->name};
$default = $f->_check_default_value($default);
if (!$default)
if ($default ne ($h->{$f->id} && $h->{$f->id}->{$controlling_value_id} || ''))
{
push @{$mod->{del}}, [ $f->id ];
if (!$default)
{
push @{$def->{del}}, [ $f->id ];
}
else
{
trick_taint($default);
push @{$def->{add}}, [ $f->id, $default ];
}
$touched->{$f->id} = 1;
}
else
{
trick_taint($default);
push @{$mod->{add}}, [ $f->id, $default ];
}
$touched->{$f->id} = 1;
}
if (@{$mod->{del}} || @{$mod->{add}})
if (@{$def->{del}} || @{$def->{add}})
{
Bugzilla->dbh->do(
'DELETE FROM field_defaults WHERE visibility_value_id=? AND field_id IN ('.
join(',', map { $_->[0] } (@{$mod->{add}}, @{$mod->{del}})).')',
join(',', map { $_->[0] } (@{$def->{add}}, @{$def->{del}})).')',
undef, $controlling_value_id
);
}
if (@{$mod->{add}})
if (@{$def->{add}})
{
Bugzilla->dbh->do(
'INSERT INTO field_defaults (visibility_value_id, field_id, default_value) VALUES '.
join(',', map { "($controlling_value_id, $_->[0], ?)" } @{$mod->{add}}),
undef, map { $_->[1] } @{$mod->{add}}
join(',', map { "($controlling_value_id, $_->[0], ?)" } @{$def->{add}}),
undef, map { $_->[1] } @{$def->{add}}
);
}
# Update metadata timestamp for many fields at once
@ -1084,6 +1092,19 @@ sub update_control_lists
);
Bugzilla->refresh_cache_fields;
}
if (@{$mod->{add}} || @{$mod->{del}} || @{$def->{del}} || @{$def->{add}})
{
Bugzilla->add_result_message({
message => 'control_lists_updated',
field_id => $self->id,
value_id => $controlling_value_id,
del_defaults => [ map { $_->[0] } @{$def->{del}} ],
add_defaults => [ map { $_->[0] } @{$def->{add}} ],
%$rpt,
});
return 1;
}
return 0;
}
sub update_controlled_values

2
editcomponents.cgi
View File

@ -241,7 +241,7 @@ if ($action eq 'update') {
$component->set_is_active(scalar $cgi->param('is_active'));
my $changes = $component->update();
$component->field->update_control_lists($component->id, $ARGS);
$changes->{control_lists} = 1 if $component->field->update_control_lists($component->id, $ARGS);
$vars->{'message'} = 'component_updated';
$vars->{'comp'} = $component;

2
editmilestones.cgi
View File

@ -207,7 +207,7 @@ if ($action eq 'update') {
$milestone->set_is_active($isactive);
my $changes = $milestone->update();
$milestone->field->update_control_lists($milestone->id, $ARGS);
$changes->{control_lists} = 1 if $milestone->field->update_control_lists($milestone->id, $ARGS);
delete_token($token);

2
editproducts.cgi
View File

@ -321,7 +321,7 @@ if ($action eq 'update')
my $changes = $product->update();
$product->field->update_control_lists($product->id, $ARGS);
$changes->{control_lists} = 1 if $product->field->update_control_lists($product->id, $ARGS);
delete_token($token);

2
editversions.cgi
View File

@ -202,7 +202,7 @@ if ($action eq 'update') {
$version->set_is_active($isactive);
my $changes = $version->update();
$version->field->update_control_lists($version->id, $ARGS);
$changes->{control_lists} = 1 if $version->field->update_control_lists($version->id, $ARGS);
$dbh->bz_commit_transaction();
delete_token($token);

2
template/en/default/global/hidden-fields.html.tmpl
View File

@ -44,7 +44,7 @@
</p>
</div>
[% ELSE %]
[% FOREACH mvalue = p.$field %]
[% FOREACH mvalue = p.$field.slice(0) %]
<input type="hidden" name="[% field | html %]" value="[% mvalue | html | html_linebreak %]" />
[% END %]
[% END %]

30
template/en/default/global/messages.html.tmpl
View File

@ -99,6 +99,28 @@
<div class="message">Active values updated.</div>
[% END %]
[% BLOCK msg_control_lists_updated %]
<p>
[% t = Bugzilla.get_field(field_id).description | html %]
[% ch = {
'add_is_visible' => 'Field(s) X are now visible for this ' _ t
'del_is_visible' => 'Field(s) X are now invisible for this ' _ t
'add_is_cloned' => 'Field(s) X will be copied during clone of ' _ terms.Bugs _ ' with this ' _ t
'del_is_cloned' => 'Field(s) X will not be copied during clone of ' _ terms.Bugs _ ' with this ' _ t
'add_is_nullable' => 'Field(s) X may now be empty in this ' _ t
'del_is_nullable' => 'Field(s) X are now mandatory in this ' _ t
'add_defaults' => 'Default X updated for this ' _ t
'del_defaults' => 'Default X deleted for this ' _ t
} %]
[% FOREACH k = ch.keys %]
[% IF $k.size %]
[% fields = BLOCK %][% FOR f = $k %][% ", " IF loop.index %][% Bugzilla.get_field(f).description | html %][% END %][% END %]
[% ch.$k.replace('X', fields) | html %].<br />
[% END %]
[% END %]
</p>
[% END %]
[%# This is a list of all the possible messages. Please keep them in
# alphabetical order by message tag, and leave a blank line between messages.
#%]
@ -290,7 +312,7 @@
[% BLOCK msg_component_updated %]
[% title = "Component Updated" %]
[% IF changes.keys.size %]
Changes to the component <em>[% comp.name | html %]</em> have been saved:
Changes to the component <em>[% comp.name | html %]</em> have been saved.
<ul>
[% IF changes.name.defined %]
<li>Name updated to '[% comp.name | html %]'</li>
@ -678,8 +700,7 @@
[% BLOCK msg_milestone_updated %]
[% title = "Milestone Updated" %]
[% IF changes.size %]
Changes to the milestone <em>[% milestone.name | html %]</em>
have been saved:
Changes to the milestone <em>[% milestone.name | html %]</em> have been saved.
<ul>
[% IF changes.value.defined %]
<li>Milestone name updated to <em>[% milestone.name | html %]</em></li>
@ -1022,8 +1043,7 @@
[% BLOCK msg_version_updated %]
[% SET title = "Version Updated" IF 1 %]
[% IF changes.size %]
Changes to the version <em>[% version.name FILTER html %]</em>
have been saved:
Changes to the version <em>[% version.name FILTER html %]</em> have been saved.
<ul>
[% IF changes.value.defined %]
<li>Version renamed to <em>[% version.name FILTER html %]</em></li>