Skip to content

bugzilla
bugzilla
Commit a43231dd authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Bug 456922: Now that Bugzilla::Field::Choice is complete, clean up…

Bug 456922: Now that Bugzilla::Field::Choice is complete, clean up editvalues.cgi and error messages Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bbaetz, a=mkanat
parent b03fc560
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 115 deletions
Bugzilla/Field/Choice.pm
View file @ a43231dd
......@@ -174,18 +174,17 @@ sub remove_from_db {
my $self = shift;
if ($self->is_default) {
ThrowUserError('fieldvalue_is_default',
{ field => $self->field, value => $self->name,
{ field => $self->field, value => $self,
param_name => $self->DEFAULT_MAP->{$self->field->name},
});
}
if ($self->is_static) {
ThrowUserError('fieldvalue_not_deletable',
{ field => $self->field, value => $self->name });
{ field => $self->field, value => $self });
}
if ($self->bug_count) {
ThrowUserError("fieldvalue_still_has_bugs",
{ field => $self->field, value => $self->name,
count => $self->bug_count });
{ field => $self->field, value => $self });
}
$self->SUPER::remove_from_db();
}
......@@ -272,7 +271,7 @@ sub _check_value {
&& $invocant->is_static)
{
ThrowUserError('fieldvalue_not_editable',
{ field => $field, old_value => $invocant->name });
{ field => $field, old_value => $invocant });
}
ThrowUserError('fieldvalue_undefined') if !defined $value || $value eq "";
......@@ -282,7 +281,7 @@ sub _check_value {
my $exists = $invocant->type($field)->new({ name => $value });
if ($exists && (!blessed($invocant) || $invocant->id != $exists->id)) {
ThrowUserError('fieldvalue_already_exists',
{ field => $field, value => $value });
{ field => $field, value => $exists });
}
return $value;
......
template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
View file @ a43231dd
......@@ -14,18 +14,14 @@
#%]
[%# INTERFACE:
# value: string; The field value being deleted.
# bug_count: number; The number of bugs that have this field value.
# value_count: number; The number of values left for this field, including
# this value.
# value: Bugzilla::Field::Choice; The field value being deleted.
# value_count: number; The number of values available for this field.
# field: object; the field the value is being deleted from.
# param_name: string; The name of the parameter (defaultxxx) associated
# with the field.
#%]
[% title = BLOCK %]
Delete Value '[% value FILTER html %]' from the '[% field.description FILTER html %]'
([% field.name FILTER html %]) field
Delete Value '[% value.name FILTER html %]' from the
'[% field.description FILTER html %]' ([% field.name FILTER html %]) field
[% END %]
[% PROCESS global/header.html.tmpl
......@@ -44,15 +40,18 @@
</tr>
<tr>
<td valign="top">Field Value:</td>
<td valign="top">[% value FILTER html %]</td>
<td valign="top">[% value.name FILTER html %]</td>
</tr>
<tr>
<td valign="top">[% terms.Bugs %]:</td>
<td valign="top">
[% IF bug_count %]
<a title="List of [% terms.bugs %] where '[% field.description FILTER html %]' is '
[% value FILTER html %]'"
href="buglist.cgi?[% field.name FILTER url_quote %]=[%- value FILTER url_quote %]">[% bug_count FILTER html %]</a>
[% IF value.bug_count %]
<a title="List of [% terms.bugs %] where '
[%- field.description FILTER html %]' is '
[%- value.name FILTER html %]'"
href="buglist.cgi?[% field.name FILTER url_quote %]=
[%- value.name FILTER url_quote %]">
[%- value.bug_count FILTER html %]</a>
[% ELSE %]
None
[% END %]
......@@ -62,44 +61,52 @@
<h2>Confirmation</h2>
[% IF (param_name.defined && Param(param_name) == value) || bug_count || (value_count == 1) %]
[% IF value.is_default || value.bug_count || (value_count == 1) %]
<p>Sorry, but the '[% value FILTER html %]' value cannot be deleted
from the '[% field.description FILTER html %]' field for the following reason(s):</p>
<p>Sorry, but the '[% value.name FILTER html %]' value cannot be deleted
from the '[% field.description FILTER html %]' field for the following
reason(s):</p>
<ul class="warningmessages">
[% IF param_name.defined && Param(param_name) == value %]
<li>'[% value FILTER html %]' is the default value for
the '[% field.description FILTER html %]' field.
[% IF user.in_group('tweakparams') %]
You first have to <a href="editparams.cgi?section=bugfields#
[%- param_name FILTER url_quote %]">change the default value</a> for
this field before you can delete this value.
[% END %]
[% IF value.is_default %]
<li>'[% value.name FILTER html %]' is the default value for
the '[% field.description FILTER html %]' field.
[% IF user.in_group('tweakparams') %]
You first have to <a href="editparams.cgi?section=bugfields">change
the default value</a> for this field before you can delete
this value.
[% END %]
</li>
[% END %]
[% IF bug_count %]
<li>There
[% IF bug_count > 1 %]
are [% bug_count FILTER html %] [%+ terms.bugs %]
[% ELSE %]
is 1 [% terms.bug %]
[% END %]
with this field value. You must change the field value on
<a title="List of [% terms.bugs %] where '[% field.description FILTER html %]' is '[% value FILTER html %]'"
href="buglist.cgi?[% field.name FILTER url_quote %]=[% value FILTER url_quote %]">
[% IF bug_count > 1 %]
[% IF value.bug_count %]
<li>
[% IF value.bug_count > 1 %]
There are [% value.bug_count FILTER html %] [%+ terms.bugs %]
with this field value.
[% ELSE %]
There is is 1 [% terms.bug %] with this field value.
[% END %]
You must change the field value on
<a title="List of [% terms.bugs %] where '
[%- field.description FILTER html %]' is '
[%- value.name FILTER html %]'"
href="buglist.cgi?[% field.name FILTER url_quote %]=
[%- value.name FILTER url_quote %]">
[% IF value.bug_count > 1 %]
those [% terms.bugs %]
[% ELSE %]
that [% terms.bug %]
[% END %]
</a>
to another value before you can delete this value.
</li>
[% END %]
[% IF value_count == 1 %]
<li>'[% value FILTER html %]' is the last value for
'[%- field.description FILTER html %]', and so it can not be deleted.
<li>'[% value.name FILTER html %]' is the last value for
'[%- field.description FILTER html %]', and so it can not be deleted.
</li>
[% END %]
</ul>
......@@ -111,7 +118,7 @@
<input type="submit" value="Yes, delete" id="delete">
<input type="hidden" name="action" value="delete">
<input type="hidden" name="field" value="[% field.name FILTER html %]">
<input type="hidden" name="value" value="[% value FILTER html %]">
<input type="hidden" name="value" value="[% value.name FILTER html %]">
<input type="hidden" name="token" value="[% token FILTER html %]">
</form>
......
template/en/default/admin/fieldvalues/create.html.tmpl
View file @ a43231dd
......@@ -26,26 +26,27 @@
%]
<p>
This page allows you to add a new value for the '[% field.description FILTER html %]' field.
This page allows you to add a new value for the
'[% field.description FILTER html %]' field.
</p>
<form method="post" action="editvalues.cgi">
<table border="0" cellpadding="4" cellspacing="0">
<tr>
<th align="right"><label for="value">Value:</label></th>
<td><input id="value" size="30" maxlength="60" name="value"
value=""></td>
<td><input id="value" name="value" size="30"
maxlength="[% constants.MAX_FIELD_VALUE_SIZE %]"></td>
</tr>
<tr>
<th align="right"><label for="sortkey">Sortkey:</label></th>
<td><input id="sortkey" size="10" maxlength="20" name="sortkey"
value=""></td>
<td><input id="sortkey" name="sortkey" size="6" maxlength="6"></td>
</tr>
[% IF field.name == "bug_status" %]
<tr>
<th align="right"><label for="is_open">Status Type:</label></th>
<td>
<input type="radio" id="open_status" name="is_open" value="1" checked="checked">
<input type="radio" id="open_status" name="is_open" value="1"
checked="checked">
<label for="open_status">Open</label><br>
<input type="radio" id="closed_status" name="is_open" value="0">
<label for="closed_status">Closed (requires a Resolution)</label>
......
template/en/default/admin/fieldvalues/edit.html.tmpl
View file @ a43231dd
......@@ -14,16 +14,15 @@
#%]
[%# INTERFACE:
# value: string; The field value we are editing.
# sortkey: number; Sortkey of the field value we are editing.
# field: object; The field this value belongs to.
# value: Bugzilla::Field::Choice; The field value we are editing.
# field: Bugzilla::Field; The field this value belongs to.
#%]
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]
Edit Value '[% value FILTER html %]' for the '[% field.description FILTER html %]'
([% field.name FILTER html %]) field
Edit Value '[% value.name FILTER html %]' for the
'[% field.description FILTER html %]' ([% field.name FILTER html %]) field
[% END %]
[% PROCESS global/header.html.tmpl
title = title
......@@ -33,32 +32,33 @@
<table border="0" cellpadding="4" cellspacing="0">
<tr>
<th valign="top"><label for="value">Field Value:</label></th>
<th valign="top"><label for="value_new">Field Value:</label></th>
<td>
[% IF is_static %]
<input type="hidden" name="value" value="[% value FILTER html %]">
[% value FILTER html %]
[% IF value.is_static %]
<input type="hidden" name="value_new" id="value_new"
value="[% value.name FILTER html %]">
[%- value.name FILTER html %]
[% ELSE %]
<input id="value" size="20" maxlength="60" name="value" value="
[%- value FILTER html %]">
<input id="value_new" name="value_new" size="20"
maxlength="[% constants.MAX_FIELD_VALUE_SIZE %]"
value="[% value.name FILTER html %]">
[% END %]
</td>
</tr>
<tr>
<th align="right"><label for="sortkey">Sortkey:</label></th>
<td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
[%- sortkey FILTER html %]"></td>
<td><input id="sortkey" size="6" maxlength="6" name="sortkey"
value="[%- value.sortkey FILTER html %]"></td>
</tr>
[% IF field.name == "bug_status" %]
<tr>
<th align="right"><label for="is_open">Status Type:</label></th>
<td>[% IF is_open %]Open[% ELSE %]Closed[% END %]</td>
<td>[% IF value.is_open %]Open[% ELSE %]Closed[% END %]</td>
</tr>
[% END %]
</table>
<input type="hidden" name="valueold" value="[% value FILTER html %]">
<input type="hidden" name="sortkeyold" value="[% sortkey FILTER html %]">
<input type="hidden" name="value" value="[% value.name FILTER html %]">
<input type="hidden" name="action" value="update">
<input type="hidden" name="field" value="[% field.name FILTER html %]">
<input type="hidden" name="token" value="[% token FILTER html %]">
......
template/en/default/admin/fieldvalues/footer.html.tmpl
View file @ a43231dd
......@@ -35,13 +35,14 @@
[%- field.name FILTER url_quote %]">Add</a> a value.
[% END %]
[% IF value && !no_edit_link %]
[% IF value.defined && !no_edit_link %]
Edit value <a
title="Edit value '[% value FILTER html %]' for the '
title="Edit value '[% value.name FILTER html %]' for the '
[%- field.name FILTER html %]' field"
href="editvalues.cgi?action=edit&amp;field=
[%- field.name FILTER url_quote %]&amp;value=[% value FILTER url_quote %]">
'[% value FILTER html %]'</a>.
[%- field.name FILTER url_quote %]&amp;value=
[%- value.name FILTER url_quote %]">
'[% value.name FILTER html %]'</a>.
[% END %]
[% UNLESS no_edit_other_link %]
......
template/en/default/admin/fieldvalues/list.html.tmpl
View file @ a43231dd
......@@ -58,26 +58,13 @@
} ]
%]
[% IF default.defined %]
[% overrides.action = [ {
match_value => "$default"
match_field => 'name'
override_content => 1
content => "(Default value)"
override_contentlink => 1
contentlink => undef
} ]
%]
[% END %]
[% IF static.size %]
[% UNLESS overrides.action.size %]
[% overrides.action = [] %]
[% END %]
[% SET overrides.action = [] %]
[% FOREACH check_value = values %]
[% FOREACH static_value = static %]
[% IF check_value.is_static %]
[% overrides.action.push({
match_value => "$static_value"
match_value => check_value.name
match_field => 'name'
override_content => 1
content => "(Non-deletable value)"
......@@ -85,7 +72,17 @@
contentlink => undef
})
%]
[% ELSIF check_value.is_default %]
[% overrides.action.push({
match_value => check_value.name
match_field => 'name'
override_content => 1
content => "(Default value)"
override_contentlink => 1
contentlink => undef })
%]
[% END %]
[% END %]
[% PROCESS admin/table.html.tmpl
......
template/en/default/global/messages.html.tmpl
View file @ a43231dd
......@@ -298,31 +298,31 @@
[% ELSIF message_tag == "field_value_created" %]
[% title = "New Field Value Created" %]
The value <em>[% value FILTER html %]</em> has been added as a valid choice
for the <em>[% field.description FILTER html %]</em>
The value <em>[% value.name FILTER html %]</em> has been added as a
valid choice for the <em>[% field.description FILTER html %]</em>
(<em>[% field.name FILTER html %]</em>) field.
[% IF field.name == "bug_status" %]
You should now visit the <a href="editworkflow.cgi">status workflow page</a>
to include your new [% terms.bug %] status.
You should now visit the <a href="editworkflow.cgi">status workflow
page</a> to include your new [% terms.bug %] status.
[% END %]
[% ELSIF message_tag == "field_value_deleted" %]
[% title = "Field Value Deleted" %]
The value <em>[% value FILTER html %]</em> of the
The value <em>[% value.name FILTER html %]</em> of the
<em>[% field.description FILTER html %]</em>
(<em>[% field.name FILTER html %]</em>) field has been deleted.
[% ELSIF message_tag == "field_value_updated" %]
[% title = "Field Value Updated" %]
[% IF changes.keys.size %]
The <em>[% value FILTER html %]</em> value of the
The <em>[% value_old FILTER html %]</em> value of the
<em>[% field.description FILTER html %]</em>
(<em>[% field.name FILTER html %]</em>) field has been changed:
<ul>
[% IF changes.value %]
<li>Field value updated to
<em>[% changes.value.1 FILTER html %]</em>.
[% IF value_obj.is_default %]
[% IF value.is_default %]
(Note that this value is the default for this field. All
references to the default value will now point to this new value.)
[% END %]
......@@ -334,7 +334,7 @@
[% END %]
</ul>
[% ELSE %]
No changes made to the field value <em>[% value FILTER html %]</em>.
No changes made to the field value <em>[% value_old FILTER html %]</em>.
[% END %]
[% ELSIF message_tag == "flag_cleared" %]
......
template/en/default/global/user-error.html.tmpl
View file @ a43231dd
......@@ -422,26 +422,17 @@
[% ELSIF error == "fieldname_invalid" %]
[% title = "Specified Field Does Not Exist" %]
The field '[% field FILTER html %]' does not exist or
The field '[% field.name FILTER html %]' does not exist or
cannot be edited with this interface.
[% ELSIF error == "fieldname_not_specified" %]
[% title = "Field Name Not Specified" %]
No field name specified when trying to edit field values.
[% ELSIF error == "fieldvalue_already_exists" %]
[% title = "Field Value Already Exists" %]
The value '[% value FILTER html %]' already exists for the
The value '[% value.name FILTER html %]' already exists for the
[%+ field.description FILTER html %] field.
[% ELSIF error == "fieldvalue_doesnt_exist" %]
[% title = "Specified Field Value Does Not Exist" %]
The value '[% value FILTER html %]' does not exist for
the '[% field FILTER html %]' field.
[% ELSIF error == "fieldvalue_is_default" %]
[% title = "Specified Field Value Is Default" %]
'[% value FILTER html %]' is the default value for
'[% value.name FILTER html %]' is the default value for
the '[% field.description FILTER html %]' field and cannot be deleted.
[% IF user.in_group('tweakparams') %]
You have to <a href="editparams.cgi?section=bugfields#
......@@ -456,20 +447,16 @@
[% ELSIF error == "fieldvalue_not_editable" %]
[% title = "Field Value Not Editable" %]
The value '[% old_value FILTER html %]' cannot be renamed because
The value '[% old_value.name FILTER html %]' cannot be renamed because
it plays some special role for the '[% field.description FILTER html %]'
field.
[% ELSIF error == "fieldvalue_not_deletable" %]
[% title = "Field Value Not Deletable" %]
The value '[% value FILTER html %]' cannot be removed because
The value '[% value.name FILTER html %]' cannot be removed because
it plays some special role for the '[% field.description FILTER html %]'
field.
[% ELSIF error == "fieldvalue_not_specified" %]
[% title = "Field Value Not Specified" %]
No field value specified when trying to edit a field value.
[% ELSIF error == "fieldvalue_reserved_word" %]
[% title = "Reserved Word Not Allowed" %]
You cannot use the value '[% value FILTER html %]' for the
......@@ -484,9 +471,9 @@
[% ELSIF error == "fieldvalue_still_has_bugs" %]
[% title = "You Cannot Delete This Field Value" %]
You cannot delete the value '[% value FILTER html %]' from the
You cannot delete the value '[% value.name FILTER html %]' from the
[% field.description FILTER html %] field, because there are still
[%+ count FILTER html %] [%+ terms.bugs %] using it.
[%+ value.bug_count FILTER html %] [%+ terms.bugs %] using it.
[% ELSIF error == "fieldvalue_undefined" %]
[% title = "Undefined Value Not Allowed" %]
......
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