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

3 files changed, 49 insertions, 7 deletions

diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl
index cca19981b..d0c50f69a 100644
--- a/template/en/default/admin/groups/delete.html.tmpl
+++ b/template/en/default/admin/groups/delete.html.tmpl
@@ -30,6 +30,7 @@
   # hasbugs: boolean int. True if the group includes bugs in it.
   # hasproduct: boolean int. True if the group is binded to a product.
   # hasflags: boolean int. True if the group is used by a flag type.
+  # shared_queries: int. Number of saved searches being shared with this group.
   # buglist: string. The list of bugs included in this group.
   #%]
 
@@ -92,6 +93,25 @@
     flag types from this group for me.</p>
   [% END %]
 
+  [% IF shared_queries %]
+    <p>
+      <b>There
+      [% IF shared_queries > 1 %]
+        are [% shared_queries %] saved searches
+      [% ELSE %]
+        is a saved search
+      [% END %]
+      being shared with this group.</b>
+      If you delete this group,
+      [% IF shared_queries > 1 %]
+        these saved searches
+      [% ELSE %]
+        this saved search
+      [% END %]
+      will fall back to being private again.
+    </p>
+  [% END %]
+
   <h2>Confirmation</h2>
 
   <p>Do you really want to delete this group?</p>
diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl
index 9016a7038..630777998 100644
--- a/template/en/default/admin/params/groupsecurity.html.tmpl
+++ b/template/en/default/admin/params/groupsecurity.html.tmpl
@@ -46,6 +46,9 @@
   timetrackinggroup => "The name of the group of users who can see/change time tracking " _
                        "information.",
 
+  querysharegroup => "The name of the group of users who can share their " _
+                     "saved searches with others.",
+
   usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _
                          "specific groups?",
   
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 6b7bdcf10..e5f3a392b 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -31,7 +31,8 @@
   # flags.requestee:          number of flags the viewed user is being asked for
   # flags.setter:             number of flags the viewed user has set
   # longdescs:                number of bug comments the viewed user has written
-  # namedqueries:             number of named queries the user has created
+  # namedqueries:             array of IDs of named queries the user has created
+  # namedquery_group_map:     number of named queries the user has shared
   # profiles_activity:        number of named queries the user has created
   # series:                   number of series the viewed user has created
   # votes:                    number of bugs the viewed user has voted on
@@ -301,17 +302,35 @@
         [% IF namedqueries %]
           <li>
             [% otheruser.login FILTER html %] has
-            [% IF namedqueries == 1 %]
-              a named query
+            [% IF namedqueries.size == 1 %]
+              a [% 'shared' IF namedquery_group_map %] named search
             [% ELSE %]
-              [%+ namedqueries %] named queries
+              [%+ namedqueries.size %] named searches
             [% END %].
-            [% IF namedqueries == 1 %]
-              This named query
+            [% IF namedqueries.size == 1 %]
+              This named search
             [% ELSE %]
-              These named queries
+              These named searches
             [% END %]
             will be deleted along with the user account.
+            [% IF namedquery_group_map %]
+              [% IF namedqueries.size > 1 %]
+                Of these,
+                [% IF namedquery_group_map > 1 %]
+                  [%+ namedquery_group_map FILTER html %] are
+                [% ELSE %]
+                  one is
+                [% END %]
+                shared.
+              [% END %]
+              Other users will not be able to use
+              [% IF namedquery_group_map > 1 %]
+                these shared named searches
+              [% ELSE %]
+                this shared named search
+              [% END %]
+              any more.
+            [% END %]
           </li>
         [% END %]
         [% IF profile_setting %]