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 7da36f2e590beac0ddbe899bec41f1895d8d56cc..755e4464a92ba173c31e364451873f4f92dad2a5 100644 (file)
--- 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 0adb3afa8e1bf8a365ce23b46d400091f85b8a9c..1c6737c11bbcfa47138344cd780bc456d23ce72c 100644 (file)
--- 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>