summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bug_form.pl6
-rw-r--r--template/en/default/bug/edit.html.tmpl8
2 files changed, 8 insertions, 6 deletions
diff --git a/bug_form.pl b/bug_form.pl
index 406d86c40..db09d8d58 100644
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -274,8 +274,10 @@ sub show_bug {
|| $::userid == $bug{'reporter'}
|| $::userid == $bug{'qa_contact'}
|| $::userid == $bug{'assigned_to'}
- || UserInGroup("editbugs");
- $user{'canconfirm'} = ($::userid == 0) || UserInGroup("canconfirm");
+ || UserInGroup("editbugs");
+ $user{'canconfirm'} = ($::userid == 0)
+ || UserInGroup("canconfirm")
+ || UserInGroup("editbugs");
# Bug states
$bug{'isunconfirmed'} = ($bug{'bug_status'} eq $::unconfirmedstate);
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 83972baae..e0ecf2623 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -371,7 +371,7 @@
[% knum = 1 %]
[% IF bug.bug_status == "UNCONFIRMED" &&
- (user.canedit || user.canconfirm) %]
+ user.canconfirm %]
<input type="radio" name="knob" value="confirm">
Confirm bug (change status to <b>NEW</b>)
<br>
@@ -380,7 +380,7 @@
[% IF user.canedit %]
[% IF bug.isopened %]
- [% IF bug.bug_status != "ASSIGNED" %]
+ [% IF bug.bug_status != "ASSIGNED" && user.canconfirm %]
<input type="radio" name="knob" value="accept">
Accept bug (
[% "confirm bug, " IF bug.isunconfirmed %]change
@@ -424,7 +424,7 @@
}"
value="[% bug.assigned_to_email FILTER html %]">
<br>
- [% IF bug.isunconfirmed %]
+ [% IF bug.isunconfirmed && user.canconfirm %]
&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="andconfirm">
and confirm bug (change status to <b>NEW</b>)
<br>
@@ -436,7 +436,7 @@
[% "and QA contact" IF useqacontact %]
of selected component
<br>
- [% IF bug.isunconfirmed %]
+ [% IF bug.isunconfirmed && user.canconfirm %]
&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="compconfirm">
and confirm bug (change status to <b>NEW</b>)
<br>