Bug 698068: The "There is no saved search named ..." page has a "forget" link

r=glob a=LpSolit

diff --git a/Bugzilla/Search/Saved.pm b/Bugzilla/Search/Saved.pm
index f7d5971d403ce9ba181620aefbddeb90ba94e4b2..c9885c9cec0dc3971dd20aedadb135596f72dbb8 100644 (file)
--- a/Bugzilla/Search/Saved.pm
+++ b/Bugzilla/Search/Saved.pm
@@ -96,7 +96,7 @@ sub check {
     if (!$search->shared_with_group
         or !$user->in_group($search->shared_with_group)) 
     {
-        ThrowUserError('missing_query', { queryname => $search->name, 
+        ThrowUserError('missing_query', { name => $search->name,
                                           sharer_id => $search->user->id });
     }
 

diff --git a/buglist.cgi b/buglist.cgi
index 13a2ef043c7bb4bd66fbf32671ab25917b72cde5..3466b46817b650eccf1499ec613f05b8cda044f0 100755 (executable)
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -183,7 +183,7 @@ sub LookupNamedQuery {
     Bugzilla->login(LOGIN_REQUIRED);
 
     my $query = Bugzilla::Search::Saved->check(
-        { user => $sharer_id, name => $name });
+        { user => $sharer_id, name => $name, _error => 'missing_query' });
 
     $query->url
        || ThrowUserError("buglist_parameters_required");

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 2d79bf851b1ed2981d84aaa7c9f8e776681eb517..41205ccb6bbf7bd20ffc135a936816f73cef5c0a 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1171,7 +1171,7 @@
     [% title = "Missing Search" %]
     [% docslinks = {'query.html' => "Searching for $terms.bugs",
                     'query.html#list' => "$terms.Bug lists"} %]
-    The search named <em>[% queryname FILTER html %]</em>
+    The search named <em>[% name FILTER html %]</em>
     [% IF sharer_id && sharer_id != user.id %]
       has not been made visible to you.
     [% ELSE %]