diff options
| -rwxr-xr-x | buglist.cgi | 7 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 23 |
2 files changed, 14 insertions, 16 deletions
diff --git a/buglist.cgi b/buglist.cgi index 8aa9249df..ce45dc2c0 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -544,12 +544,15 @@ elsif (($cgi->param('cmdtype') eq "doit") && defined $cgi->param('remtype')) { $bug_ids{$bug_id} = $keep_bug; $changes = 1; } - ThrowUserError('no_bug_ids', {'action' => $action}) unless $changes; + ThrowUserError('no_bug_ids', + {'action' => $action, + 'tag' => $query_name}) + unless $changes; # Only keep bug IDs we want to add/keep. Disregard deleted ones. my @bug_ids = grep { $bug_ids{$_} == 1 } keys %bug_ids; # If the list is now empty, we could as well delete it completely. - ThrowUserError('no_bugs_in_list', {'saved_search' => $query_name}) + ThrowUserError('no_bugs_in_list', {'tag' => $query_name}) unless scalar(@bug_ids); $new_query = "bug_id=" . join(',', sort {$a <=> $b} @bug_ids); diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 37c542614..c91875812 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -902,10 +902,6 @@ The name of a milestone is limited to 20 characters. '[% name FILTER html %]' is too long ([% name.length %] characters). - [% ELSIF error == "milestone_not_specified" %] - [% title = "No Milestone Specified" %] - No milestone specified when trying to edit milestones. - [% ELSIF error == "milestone_not_valid" %] [% title = "Specified Milestone Does Not Exist" %] The milestone '[% milestone FILTER html %]' for product @@ -1044,26 +1040,25 @@ You didn't define any axes to plot. [% ELSIF error == "no_bugs_chosen" %] - [% title = BLOCK %]No [% terms.Bugs %] Chosen[% END %] + [% title = BLOCK %]No [% terms.Bugs %] Selected[% END %] You apparently didn't choose any [% terms.bugs %] to modify. [% ELSIF error == "no_bug_ids" %] - [% title = BLOCK %]No [% terms.Bugs %] Chosen[% END %] + [% title = BLOCK %]No [% terms.Bugs %] Selected[% END %] You didn't choose any [% terms.bugs %] to [% IF action == "add" %] add to [% ELSE %] remove from [% END %] - the saved search. + the [% tag FILTER html %] tag. [% ELSIF error == "no_bugs_in_list" %] - [% title = "Delete Saved Search?" %] - You are going to remove all [% terms.bugs %] from the '[% saved_search FILTER html %]' - saved search. This will delete this saved search completely. Click + [% title = "Delete Tag?" %] + This will remove all [% terms.bugs %] from the + [% tag FILTER html %] tag. This will delete the tag completely. Click <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= - [%- saved_search FILTER url_quote %]">here</a> if you really want to - remove it. + [%- tag FILTER url_quote %]">here</a> if you really want to delete it. [% ELSIF error == "no_bugs_to_remove" %] - [% title = "No Saved Search Selected" %] - You didn't select any saved search to remove [% terms.bugs %] from. + [% title = "No Tag Selected" %] + You didn't select a tag from which to remove [% terms.bugs %]. [% ELSIF error == "no_component_change_for_multiple_products" %] [% title = "Action Not Permitted" %] |