Attachment 313420 Details for Bug 457873 – v1 to fix flag visibility error

[patch] v1 to fix flag visibility error

flag_visibility.patch (text/plain), 2.58 KB, created by Noura El hawary on 2008-08-05 05:22:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noura El hawary

Created: 2008-08-05 05:22:27 UTC

Size: 2.58 KB

patch

obsolete

>Index: template/en/default/bug/edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/bug/edit.html.tmpl,v
>retrieving revision 1.39
>diff -p -u -r1.39 edit.html.tmpl
>--- template/en/default/bug/edit.html.tmpl	4 Aug 2008 16:24:27 -0000	1.39
>+++ template/en/default/bug/edit.html.tmpl	5 Aug 2008 05:19:41 -0000
>@@ -1030,6 +1030,7 @@
>             (<a href="#" id="bz_flags_edit_action">edit</a>)<br>
>             [% setflags = 0 %]
>             [% FOREACH type = bug.flag_types %]
>+              [% IF user.can_see_flag(type) %]
>               [% FOREACH flag = type.flags %]
>                 [% setflags = 1 %]
>                 [% flag.setter.nick FILTER html %]:
>@@ -1038,12 +1039,14 @@
>                   ([% flag.requestee.nick FILTER html %])
>                 [% END %]<br>
>               [% END %]
>+              [% END %]
>             [% END %]
>             [% IF NOT setflags %]None Set[% END %]
>           </span>
>         </div>
>       [% ELSE %]
>         [% FOREACH type = bug.flag_types %]
>+          [% IF user.can_see_flag(type) %]
>           [% FOREACH flag = type.flags %]
>             [% flag.setter.nick FILTER html %]:
>             [%+ type.name FILTER html FILTER no_break %][% flag.status %]
>@@ -1051,6 +1054,7 @@
>               ([% flag.requestee.nick FILTER html %])
>             [% END %]<br>
>           [% END %]
>+          [% END %]
>         [% END %]
>       [% END %]
>       </td>
>Index: template/en/default/flag/list.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/flag/list.html.tmpl,v
>retrieving revision 1.3
>diff -p -u -r1.3 list.html.tmpl
>--- template/en/default/flag/list.html.tmpl	20 May 2008 20:16:03 -0000	1.3
>+++ template/en/default/flag/list.html.tmpl	5 Aug 2008 05:20:03 -0000
>@@ -98,7 +98,7 @@
> 
>   [%# Step 1: Display every flag type (except inactive types with no flags). %]
>   [% FOREACH type = flag_types %]
>-    
>+    [% IF user.can_see_flag(type) %]    
>     [%# Step 1a: Display existing flag(s). %]
>     [% FOREACH flag = type.flags %]
>       <tr>
>@@ -218,9 +218,11 @@
>       </tr>
>     [% END %]
>   [% END %]
>+  [% END %]
> 
>   [%# Step 2: Display flag type again (if type is multiplicable). %]
>   [% FOREACH type = flag_types %]
>+    [% IF user.can_see_flag(type) %]
>     [% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %]
>     [% IF !separator_displayed %]
>         <tr><td colspan="3"><hr></td></tr>
>@@ -271,5 +273,6 @@
>       [% END %]
>     </tr>
>   [% END %]
>+  [% END %]
> 
> </table>

Actions: View | Diff

Attachments on bug 457873: 313420