From 1879703e14d3e19803997e5f5e746d25c78faf71 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Sat, 21 Jul 2007 15:59:23 +0000 Subject: Bug 365890: Searches shared by users with bless rights are in the footer by default, with no warning - Patch by Teemu Mannermaa r/a=LpSolit --- template/en/default/account/prefs/prefs.html.tmpl | 1 + .../default/account/prefs/saved-searches.html.tmpl | 33 +++++++++++++++++++++- userprefs.cgi | 8 +++--- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index da1b489e8..eada10557 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -41,6 +41,7 @@ title = "User Preferences" subheader = filtered_login style_urls = ['skins/standard/admin.css'] + javascript_urls = ['js/util.js'] %] [% tabs = [{ name => "settings", label => "General Preferences", diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 2e5c8eac6..173933d00 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -22,8 +22,25 @@ [%# INTERFACE: # queryshare_groups: list of groups the user may share queries with # (id, name). + # bless_group_ids: list of group ids the user may bless. #%] +[% IF user.can_bless %] + +[% END %] +

Your saved searches are as follows:

@@ -103,7 +120,8 @@ [% IF may_share %] - [% FOREACH group = queryshare_groups %] [% END %] + [% IF user.can_bless %] + + + [% END %] [% IF q.shared_with_users %] (shared with [% q.shared_with_users FILTER html %] [%+ q.shared_with_users > 1 ? "users" : "user" %]) @@ -121,6 +147,11 @@ [% END %] +[% IF user.can_bless %] +

Note that for every search that has the "Add to footer" selected, a + link to the shared search is added to the footer of every user that is + a direct member of the group at the time you click Submit Changes.

+[% END %]

You may use these searches saved and shared by others:

diff --git a/userprefs.cgi b/userprefs.cgi index 1ad7f906e..8f2e69f1e 100755 --- a/userprefs.cgi +++ b/userprefs.cgi @@ -399,6 +399,7 @@ sub DoSavedSearches { $vars->{'queryshare_groups'} = Bugzilla::Group->new_from_list($user->queryshare_groups); } + $vars->{'bless_group_ids'} = [map {$_->{'id'}} @{$user->bless_groups}]; } sub SaveSavedSearches { @@ -458,10 +459,9 @@ sub SaveSavedSearches { } # If we're sharing our query with a group we can bless, we - # subscribe direct group members to our search automatically. - # Otherwise, the group members need to opt in. This behaviour - # is deemed most likely to fit users' needs. - if ($user->can_bless($group_id)) { + # have the ability to add link to our search to the footer of + # direct group members automatically. + if ($user->can_bless($group_id) && $cgi->param('force_' . $q->id)) { my $group = new Bugzilla::Group($group_id); my $members = $group->members_non_inherited; foreach my $member (@$members) { -- cgit v1.2.3-24-g4f1b