From: bbaetz%student.usyd.edu.au <>
Date: Tue, 9 Jul 2002 08:17:56 +0000 (+0000)
Subject: Bug 151714 - user with no canconfirm permission should not get option to
X-Git-Tag: bugzilla-2.16~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ab74954332d491290edc28a1a8cb70412b2c3e5;p=thirdparty%2Fbugzilla.git

Bug 151714 - user with no canconfirm permission should not get option to
mark bugs they reported as NEW
r=jouni, myk
---

diff --git a/bug_form.pl b/bug_form.pl
index 7da36f2e59..755e4464a9 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 0adb3afa8e..1c6737c11b 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -365,7 +365,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>
@@ -374,7 +374,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
@@ -418,7 +418,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>
@@ -430,7 +430,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>