From c33b4eb31dbf095c98bf5bf8950e114b80273f08 Mon Sep 17 00:00:00 2001 From: "olav%bkor.dhs.org" <> Date: Mon, 23 Oct 2006 05:41:40 +0000 Subject: Bug 121576: fields should not be editable when viewing a bug if the user is not logged in Patch by Olav Vitters r=LpSolit a=justdave --- template/en/default/bug/edit.html.tmpl | 152 ++++++++++++++++++-------------- template/en/default/filterexceptions.pl | 3 +- 2 files changed, 88 insertions(+), 67 deletions(-) (limited to 'template/en') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index ee13bbc2f..a896bd682 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -20,6 +20,7 @@ # Vaskin Kissoyan # Max Kanat-Alexander # Frédéric Buclin + # Olav Vitters #%] [% PROCESS global/variables.none.tmpl %] @@ -215,7 +216,7 @@ [% FOREACH field = fields %] [% PROCESS bug/field.html.tmpl value=bug.${field.name} - editable = bug.check_can_change_field(field.name, 0, 1) || !user.id + editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% END %] @@ -262,10 +263,22 @@ @@ -362,40 +375,42 @@
- [% IF bug.flag_types.size > 0 %] - [% PROCESS "flag/list.html.tmpl" flag_no_header = 1 - flag_types = bug.flag_types - any_flags_requesteeble = bug.any_flags_requesteeble %] + [% IF user.id %] + [% IF bug.flag_types.size > 0 %] + [% PROCESS "flag/list.html.tmpl" flag_no_header = 1 + flag_types = bug.flag_types + any_flags_requesteeble = bug.any_flags_requesteeble %] + [% END %] + [% ELSE %] + [% FOREACH type = bug.flag_types %] + [% FOREACH flag = type.flags %] + [% flag.setter.nick FILTER html %]: + [%+ type.name FILTER html FILTER no_break %][% flag.status %] + [%+ IF flag.requestee %] + ([% flag.requestee.nick FILTER html %]) + [% END %]
+ [% END %] + [% END %] [% END %]
- + + [% INCLUDE global/textarea.html.tmpl + name = 'comment' + id = 'comment' + minrows = 10 + maxrows = 25 + cols = constants.COMMENT_COLS + %] + + [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] + [% has_role = bug.user.isreporter + || bug.assigned_to.id == user.id + || (Param('useqacontact') + && bug.qa_contact + && bug.qa_contact.id == user.id) %] + +
+ + + [% END %] + + [% END %] [% END %] - - - - + [% IF user.id %] + + + + + [% END %] [% IF bug.cc %] @@ -704,15 +721,18 @@ : [% ELSE %] @@ -736,11 +756,11 @@ [% END %] @@ -753,7 +773,7 @@ [% BLOCK select %] @@ -775,7 +795,7 @@ [% BLOCK input %] [% val = value ? value : bug.$inputname %] - [% IF bug.check_can_change_field(inputname, 0, 1) || !user.id %] + [% IF bug.check_can_change_field(inputname, 0, 1) %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 58988b68e..2057e3974 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -319,7 +319,8 @@ 'inputname', '" colspan=\"$colspan\"" IF colspan', '" size=\"$size\"" IF size', - '" maxlength=\"$maxlength\"" IF maxlength' + '" maxlength=\"$maxlength\"" IF maxlength', + 'flag.status', ], 'bug/knob.html.tmpl' => [ -- cgit v1.2.3-24-g4f1b
- : - [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %] - - - [% END %] -
- - [% INCLUDE global/textarea.html.tmpl - name = 'comment' - id = 'comment' - minrows = 10 - maxrows = 25 - cols = constants.COMMENT_COLS - %] - - [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] - [% has_role = bug.user.isreporter - || bug.assigned_to.id == user.id - || (Param('useqacontact') - && bug.qa_contact - && bug.qa_contact.id == user.id) %] - + [% IF user.id %] + 		+ : + [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %] + + + [% END %]
- - - [% END %] -
@@ -491,7 +506,7 @@ [% END %] [% END %] -[% PROCESS bug/knob.html.tmpl %] +[% PROCESS bug/knob.html.tmpl IF user.id %] [%# *** Additional Comments *** %] @@ -500,7 +515,7 @@
[% PROCESS bug/comments.html.tmpl comments = bug.longdescs - mode = "edit" + mode = user.id ? "edit" : "show" %]
@@ -658,7 +673,7 @@ :
- [% IF bug.check_can_change_field("qa_contact", 0, 1) || !user.id %] + [% IF bug.check_can_change_field("qa_contact", 0, 1) %] [% INCLUDE global/userselect.html.tmpl id => "qa_contact" name => "qa_contact" @@ -667,7 +682,7 @@ emptyok => 1 %] [% ELSE %] - [% IF bug.qa_contact.login && bug.qa_contact.login.length > 30 %] @@ -683,20 +698,22 @@
- : - - [% INCLUDE global/userselect.html.tmpl - id => "newcc" - name => "newcc" - value => "" - size => 30 - multiple => 5 - %] -
+ : + + [% INCLUDE global/userselect.html.tmpl + id => "newcc" + name => "newcc" + value => "" + size => 30 + multiple => 5 + %] +
- [% FOREACH c = bug.cc %] [% END %] -
- - [%%] -
+ [% IF user.id %] +
+ + [%%] +
+ [% END %] 		- [% IF bug.check_can_change_field(dep.fieldname, 0, 1) || !user.id %] + [% IF bug.check_can_change_field(dep.fieldname, 0, 1) %] [% ELSE %] - [% END %] - [% IF bug.check_can_change_field(selname, 0, 1) || !user.id %] + [% IF bug.check_can_change_field(selname, 0, 1) %] + [% bug.${selname} FILTER html %] [% END %]