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

Bug 561296: A fix allowing updating a field value's name when it is

Browse Source 
the default value
r=LpSolit, a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@260309 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2010-05-14 14:34:34 +00:00
parent 79a5fd7406
commit de34e60cb7
6 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@@ -1 +1 @@
7169
7170

8
mozilla/webtools/bugzilla/Bugzilla/CGI.pm
View File

@@ -329,6 +329,14 @@ sub _fix_utf8 {
return $input;
}
sub should_set {
my ($self, $param) = @_;
my $set = (defined $self->param($param)
or defined $self->param("defined_$param"))
? 1 : 0;
return $set;
}
# The various parts of Bugzilla which create cookies don't want to have to
# pass them around to all of the callers. Instead, store them locally here,
# and then output as required from |header|.

21
mozilla/webtools/bugzilla/Bugzilla/Field/Choice.pm
View File

@@ -61,7 +61,7 @@ use constant VALIDATORS => {
value => \&_check_value,
sortkey => \&_check_sortkey,
visibility_value_id => \&_check_visibility_value_id,
isactive => \&Bugzilla::Object::check_boolean,
isactive => \&_check_isactive,
};
use constant CLASS_MAP => {
@@ -216,6 +216,25 @@ sub set_visibility_value {
# Validators #
##############
sub _check_isactive {
my ($invocant, $value) = @_;
$value = Bugzilla::Object::check_boolean($invocant, $value);
if (!$value and ref $invocant) {
if ($invocant->is_default) {
my $field = $invocant->field;
ThrowUserError('fieldvalue_is_default',
{ value => $invocant, field => $field,
param_name => $invocant->DEFAULT_MAP->{$field->name}
});
}
if ($invocant->is_static) {
ThrowUserError('fieldvalue_not_deletable',
{ value => $invocant, field => $invocant->field });
}
}
return $value;
}
sub _check_value {
my ($invocant, $value) = @_;

6
mozilla/webtools/bugzilla/editvalues.cgi
View File

@@ -181,12 +181,12 @@ if ($action eq 'edit') {
if ($action eq 'update') {
check_token_data($token, 'edit_field_value');
$vars->{'value_old'} = $value->name;
if ($cgi->should_set('is_active')) {
$value->set_is_active($cgi->param('is_active'));
}
$value->set_name($cgi->param('value_new'));
$value->set_sortkey($cgi->param('sortkey'));
$value->set_visibility_value($cgi->param('visibility_value_id'));
if (!($value->is_static || $value->is_default)) {
$value->set_is_active($cgi->param('is_active'));
}
$vars->{'changes'} = $value->update();
delete_token($token);
$vars->{'message'} = 'field_value_updated';

6
mozilla/webtools/bugzilla/template/en/default/admin/fieldvalues/edit.html.tmpl
View File

@@ -94,7 +94,11 @@
[% ELSIF value.is_static %]
This value is non-deletable and cannot be disabled.
[% END %]
</td>
[% IF !(value.is_default OR value.is_static) %]
<input id="defined_is_active" name="defined_is_active"
type="hidden" value="1">
[% END %]
</td>
</tr>
</table>
<input type="hidden" name="value" value="[% value.name FILTER html %]">

9
mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
View File

@@ -521,7 +521,8 @@
[% ELSIF error == "fieldvalue_is_default" %]
[% title = "Specified Field Value Is Default" %]
'[% value.name FILTER html %]' is the default value for
the '[% field.description FILTER html %]' field and cannot be deleted.
the '[% field.description FILTER html %]' field and cannot be deleted
or disabled.
[% IF user.in_group('tweakparams') %]
You have to <a href="editparams.cgi?section=bugfields#
[%- param_name FILTER url_quote %]">change</a> the default value first.
@@ -541,9 +542,9 @@
[% ELSIF error == "fieldvalue_not_deletable" %]
[% title = "Field Value Not Deletable" %]
The value '[% value.name FILTER html %]' cannot be removed because
it plays some special role for the '[% field.description FILTER html %]'
field.
The value '[% value.name FILTER html %]' cannot be removed or
disabled, because it plays some special role for the
'[% field.description FILTER html %]' field.
[% ELSIF error == "fieldvalue_reserved_word" %]
[% title = "Reserved Word Not Allowed" %]