From 4827e4de822cbc33acbf66c1d5b4a392c5a3f90c Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Tue, 27 Feb 2007 00:21:05 +0000
Subject: Bug 369982: Meaningless column in userprefs.cgi if the user cannot
 share his saved searches - Patch by Frédéric Buclin <LpSolit@gmail.com>
 r=wicked a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/account/prefs/saved-searches.html.tmpl | 27 +++++++++-------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'template/en/default/account/prefs')

diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl
index e4bbc51ae..399f31b17 100644
--- a/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -45,15 +45,10 @@
         Show in
         Footer
       </th>
-      [% querysharegroup_regexp = '^' _ Param('querysharegroup') _ '$' %]
-      [% may_share = user.groups.keys.grep($querysharegroup_regexp).size %]
+      [% may_share = user.in_group(Param('querysharegroup')) && queryshare_groups.size %]
       [% IF may_share %]
         <th>
-          Share With
-          a Group
-          [% UNLESS queryshare_groups.size %]
-            (there are no groups you may share queries with)
-          [% END %]
+          Share With a Group
         </th>
       [% END %]
     </tr>
@@ -75,9 +70,11 @@
                value="1"
                [% " checked" IF user.showmybugslink %]>
       </td>
-      <td>
-        &mdash;
-      </td>
+      [% IF may_share %]
+        <td>
+          &mdash;
+        </td>
+      [% END %]
     </tr>
     [% FOREACH q = user.queries %]
       <tr>
@@ -104,8 +101,8 @@
                  alt="[% q.name FILTER html %]"
                  [% " checked" IF q.link_in_footer %]>
         </td>
-        <td>
-          [% IF queryshare_groups.size %]
+        [% IF may_share %]
+          <td>
             <select name="share_[% q.id FILTER html %]">
               <option value="">Don't share</option>
               [% FOREACH group = queryshare_groups %]
@@ -115,10 +112,8 @@
                 >[% group.name FILTER html %]</option>
               [% END %]
             </select>
-          [% ELSE %]
-            &mdash;
-          [% END %]
-        </td>
+          </td>
+        [% END %]
       </tr>
     [% END %]
   </table>
-- 
cgit v1.2.3-24-g4f1b