From f0c7611262b3948e72e8a18a036569a78f3b51f2 Mon Sep 17 00:00:00 2001
From: "wurblzap%gmail.com" <>
Date: Fri, 14 Jul 2006 03:07:57 +0000
Subject: Bug 69000: Permit a stored query to be marked "shared" and accessible
 by other users. Patch by Marc Schumann <wurblzap@gmail.com>, r=vladd, a=myk

---
 template/en/default/global/useful-links.html.tmpl | 38 +++++++++++++++++------
 template/en/default/global/user-error.html.tmpl   | 10 ++++--
 2 files changed, 36 insertions(+), 12 deletions(-)

(limited to 'template/en/default/global')

diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 9d97b095b..44a990279 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -18,6 +18,7 @@
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #                 Svetlana Harisova <light@rathedg.com>
+  #                 Marc Schumann <wurblzap@gmail.com>
   #%]
 
 [%# Migration note: this whole file corresponds to the old %commandmenu% 
@@ -67,23 +68,40 @@
   <div id="links-saved">
     <div class="label">
       [% IF user.showmybugslink OR user.queries.size %]
-          Saved&nbsp;Searches:
+        Saved&nbsp;Searches:
       [% END %]
     </div>
     <div class="links">
-        [% IF user.showmybugslink %]
-          [% filtered_username = user.login FILTER url_quote %]
-          <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My&nbsp;[% terms.Bugs %]</a>
+      [% IF user.showmybugslink %]
+        [% filtered_username = user.login FILTER url_quote %]
+        <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My&nbsp;[% terms.Bugs %]</a>
+        [% print_pipe = 1 %]
+      [% END %]
+
+      [% FOREACH q = user.queries %]
+        [% NEXT IF q.userid != user.id %]
+        [% IF q.link_in_footer %]
+          [% " | " IF print_pipe %]
+          <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
+                   [% q.name FILTER url_quote %]">[% q.name FILTER html FILTER no_break %]</a>
           [% print_pipe = 1 %]
         [% END %]
+      [% END %]
 
-        [% FOREACH q = user.queries %]
-          [% IF q.linkinfooter %]
-            [% " | " IF print_pipe %]
-            <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER url_quote %]">[% q.name FILTER html FILTER no_break %]</a>
-            [% print_pipe = 1 %]
-          [% END %]
+      [% " <br> " IF print_pipe %]
+      [% print_pipe = 0 %]
+      [% FOREACH q = user.queries %]
+        [% NEXT IF q.userid == user.id %]
+        [% IF q.link_in_footer %]
+          [% " | " IF print_pipe %]
+          <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
+                   [% q.name FILTER url_quote %]&amp;sharer_id=
+                   [% q.userid FILTER url_quote %]"
+             class="shared"
+             title="Shared by [% q.user.identity FILTER html %]">[% q.name FILTER html FILTER no_break %]</a>
+          [% print_pipe = 1 %]
         [% END %]
+      [% END %]
     </div>
   </div>
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c615598b9..b8dbeb24f 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -920,8 +920,14 @@
                 
   [% ELSIF error == "missing_query" %]
     [% title = "Missing Search" %]
-    The search named <em>[% queryname FILTER html %]</em> does not
-    exist.
+    [% docslinks = {'query.html' => "Searching for $terms.bugs",
+                    'list.html'  => "$terms.Bug lists"} %]
+    The search named <em>[% queryname FILTER html %]</em>
+    [% IF sharer_id %]
+      has not been made visible to you.
+    [% ELSE %]
+      does not exist.
+    [% END %]
 
   [% ELSIF error == "move_bugs_disabled" %]
     [% title = BLOCK %][% terms.Bug %] Moving Disabled[% END %]
-- 
cgit v1.2.3-24-g4f1b