Bug 207085 Updating a stored query shouldn't return the same message as creating one

r=kiko

diff --git a/buglist.cgi b/buglist.cgi
index 7a2c894bfde3091adb0b0a190f10d5fa36536f38..d0469cacec5c56d67107d98b3800b443c4b3a42c 100755 (executable)
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -329,11 +329,16 @@ elsif ($::FORM{'cmdtype'} eq "doit" && $::FORM{'remember'}) {
         }
         
         my $new_in_footer = $tofooter;
+        $vars->{'message'}   = "buglist_new_named_query";
         
         # Don't add it to the list if they are reusing an existing query name.
         foreach my $query (@{$vars->{'user'}{'queries'}}) {
-            if ($query->{'name'} eq $name && $query->{'linkinfooter'} == 1) {
-                $new_in_footer = 0;
+            if ($query->{'name'} eq $name) {
+                $vars->{'message'} = "buglist_updated_named_query";
+                if ($query->{'linkinfooter'} == 1) {
+                    $new_in_footer = 0;
+                }
+                break;
             }
         }        
         
@@ -344,7 +349,6 @@ elsif ($::FORM{'cmdtype'} eq "doit" && $::FORM{'remember'}) {
             push(@{$vars->{'user'}{'queries'}}, \%query);
         }
         
-        $vars->{'message'}   = "buglist_new_named_query";
         $vars->{'queryname'} = $name;
     }
 }

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 482f7e35f60caf4e917f00f381cc9df8cfa7939b..13136d6cfb4b1af9c9839b0d85140567e078c3da 100644 (file)
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -36,10 +36,15 @@
     [% title = "Adding field to query page..." %]
     [% link  = "Click here if the page does not redisplay automatically." %]
     [% # --- %] 
+
   [% ELSIF message_tag == "buglist_load_named_query" %]
     [% title = BLOCK %]Loading your query named [% namedcmd %][% END %]
     [% link  = "Click here if the page does not redisplay automatically." %]
     [% # --- %] 
+
+  [% ELSIF message_tag == "buglist_updated_named_query" %]
+    OK, your query named <code>[% queryname FILTER html %]</code> is updated.
+
   [% ELSIF message_tag == "buglist_new_default_query" %]
     OK, you now have a new default query.  You may
     also bookmark the result of any individual query.