Attachment 312921 Details for Bug 454593 – minor update to needinfo-flag patch

[patch] minor update to needinfo-flag patch

needinfo-flag.patch (text/plain), 13.05 KB, created by Rob Landry on 2008-07-29 18:54:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Landry

Created: 2008-07-29 18:54:57 UTC

Size: 13.05 KB

patch

obsolete

>Index: Bugzilla/Flag.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Flag.pm,v
>retrieving revision 1.3
>diff -u -r1.3 Flag.pm
>--- Bugzilla/Flag.pm	21 Jul 2008 06:17:04 -0000	1.3
>+++ Bugzilla/Flag.pm	25 Jul 2008 22:59:36 -0000
>@@ -570,6 +570,12 @@
> }
> 
> sub notify {
>+    # Disable the flag notification; currently the only use is for the needinfo
>+    # flag change which should be caught by the previous events comment; we'll
>+    # revisit this again when we start to utilize flags for the queues.
>+    return;
>+
>+
>     # Sends an email notification about a flag being created or fulfilled.
>     
>     my ($flag, $template_file) = @_;
>@@ -658,14 +664,11 @@
> 
> sub perlify_record {
>     # Converts a row from the database into a Perl record.
>-    my ($exists, $id, $type_id, $bug_id, $attach_id, 
>+    my ($id, $type_id, $bug_id, $attach_id, 
>         $requestee_id, $setter_id, $status) = @_;
>     
>-    return undef unless defined($exists);
>-    
>     my $flag =
>       {
>-        exists    => $exists , 
>         id        => $id ,
>         type      => Bugzilla::FlagType::get($type_id) ,
>         target    => GetTarget($bug_id, $attach_id) , 
>Index: Bugzilla/User.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/User.pm,v
>retrieving revision 1.4
>diff -u -r1.4 User.pm
>--- Bugzilla/User.pm	21 Jul 2008 06:32:13 -0000	1.4
>+++ Bugzilla/User.pm	25 Jul 2008 22:59:36 -0000
>@@ -519,6 +519,19 @@
> 
> }
> 
>+sub email_prefs {
>+    # email_prefs fell out as part of the bz3 schema changes, unfortunately
>+    # needinfo also became a flag and flags use this to determine if they
>+    # should send email; probably that code should all move into the "notify"
>+    # function in Flag.pm but for now it's scattered about so this is filler
>+    # to keep things from throwing errors.
>+    my $prefs;
>+    foreach my $pref (qw(FlagRequestee FlagRequester)) {
>+        $prefs->{$pref} = "off";
>+    }
>+    return $prefs;
>+}
>+
> 1;
> 
> __END__
>Index: template/en/default/bug/certification-comments.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/certification-comments.html.tmpl,v
>retrieving revision 1.2
>diff -u -r1.2 certification-comments.html.tmpl
>--- template/en/default/bug/certification-comments.html.tmpl	15 Feb 2008 21:00:10 -0000	1.2
>+++ template/en/default/bug/certification-comments.html.tmpl	25 Jul 2008 22:59:36 -0000
>@@ -24,8 +24,7 @@
>       <input type="hidden" name="commentprivacy" value="1">
>     [% END %]
>     <textarea name="comment" rows="10" cols="80" wrap="hard"></textarea>
>-    <br/>
>+    <p>
>     <input type="submit" name="submit" value="Save Changes">
>-    </p>
>   [% END %]
> 
>Index: template/en/default/bug/edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/edit.html.tmpl,v
>retrieving revision 1.62
>diff -u -r1.62 edit.html.tmpl
>--- template/en/default/bug/edit.html.tmpl	24 Jul 2008 14:46:32 -0000	1.62
>+++ template/en/default/bug/edit.html.tmpl	25 Jul 2008 22:59:36 -0000
>@@ -71,6 +71,6 @@
>       [% PROCESS bug/owners.html.tmpl %]
>       [% PROCESS bug/summary.html.tmpl %]
>       [% PROCESS bug/rh_edit.html.tmpl %]
>+      [% PROCESS bug/status_edit.html.tmpl %]
>       [% PROCESS bug/tam_ack.html.tmpl %]
>       [% PROCESS bug/external_bugzilla.html.tmpl 
>          external_bugs = bug.external_bugs
>@@ -79,7 +80,7 @@
> 
>     <div id="dialog">
>       [% PROCESS "bug/certification-comments.html.tmpl" %]
>-      [% PROCESS bug/status_edit.html.tmpl %]
>     </div>
> 
>     <div id="review">
>Index: template/en/default/bug/owners.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/owners.html.tmpl,v
>retrieving revision 1.2
>diff -u -r1.2 owners.html.tmpl
>--- template/en/default/bug/owners.html.tmpl	15 Feb 2008 22:05:04 -0000	1.2
>+++ template/en/default/bug/owners.html.tmpl	25 Jul 2008 22:59:36 -0000
>@@ -8,7 +8,7 @@
>        <th>Submitter</th>
>        <td>[% bug.reporter.name FILTER html %]
>            (<a href="mailto:[% bug.reporter.email FILTER html %]">[% bug.reporter.email FILTER html %]</a>)</td>
>-       <th>TAM</th>
>+       <th>GSS/TAM</th>
>        <td>[% bug.qa_contact.name FILTER html %]
>            (<a href="mailto:[% bug.qa_contact.email FILTER html %]">[% bug.qa_contact.email FILTER html %]</a>)</td>
>        <th>Reviewer</th>
>Index: template/en/default/bug/rh_edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/rh_edit.html.tmpl,v
>retrieving revision 1.18
>diff -u -r1.18 rh_edit.html.tmpl
>--- template/en/default/bug/rh_edit.html.tmpl	21 Jul 2008 06:11:05 -0000	1.18
>+++ template/en/default/bug/rh_edit.html.tmpl	25 Jul 2008 22:59:36 -0000
>@@ -71,7 +71,7 @@
>     [% END %]
> 
> 
>-      <hr/>
>     [% IF debug %]
>+      <hr/>
>       <pre>[% debug %]</pre>
>     [% END %]
>Index: template/en/default/bug/status_edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/status_edit.html.tmpl,v
>retrieving revision 1.6
>diff -u -r1.6 status_edit.html.tmpl
>--- template/en/default/bug/status_edit.html.tmpl	20 May 2008 02:31:21 -0000	1.6
>+++ template/en/default/bug/status_edit.html.tmpl	25 Jul 2008 22:59:36 -0000
>@@ -7,19 +7,7 @@
>       <h3>Edit Dialog Status</h3>
> 
>       [% IF bug.bug_status != 'CLOSED' %]
>-        [% IF bug.bug_status == 'MODIFIED' %]
>-           [% tmp.status = 'Pending TAM response' %]
>-        [% ELSIF bug.bug_status == 'ON_QA' %]
>-           [% tmp.status = 'Pending Reviewer response' %]
>-        [% ELSIF bug.bug_status == 'NEEDINFO' %]
>-           [% tmp.status = 'Pending for Vendor response' %]
>-        [% ELSIF bug.bug_status == 'NEW' %]
>-           [% tmp.status = 'Pending for Vendor response' %]
>-        [% ELSIF bug.bug_status == 'ASSIGNED' %]
>-           [% tmp.status = 'No Response Pending' %]
>-        [% ELSE %]
>-           [% tmp.status = 'INPROGRESS' %]
>-        [% END %]
>+        [% tmp.status = 'INPROGRESS' %]
>       [% ELSE %]
>         [% tmp.status = bug.bug_status %]
>       [% END %]
>@@ -49,8 +37,8 @@
>       <tr>
>         <th>
>         <input id="knob-changestatus" type="radio" name="knob" value="changestatus" [% " disabled" IF !UserInGroup('hwcert_edit') && !isprivate %]> 
>-        <input type="hidden" name="newstatus" value="needinfo" [% " disabled" IF !UserInGroup('hwcert_edit') && !isprivate %]>
>-        <label for="knob-changestatus">Re-Open Certification, Change status to NEEDINFO</label>
>+        <input type="hidden" name="newstatus" value="assigned" [% " disabled" IF !UserInGroup('hwcert_edit') && !isprivate %]>
>+        <label for="knob-changestatus">Re-Open Certification, Change status to IN PROGRESS</label>
>         </th>
>       </tr>
>          [% IF !UserInGroup('hwcert_edit') && !isprivate %] 
>@@ -62,36 +50,17 @@
>          [% END %]
>       [% END %]
> 
>-      [% IF bug.bug_status != 'CLOSED' %]
>-      <tr>
>-        <th>
>-        <input id="knob-changestatus" type="radio" name="knob" value="changestatus"/>
>-        <label for="knob-changestatus">Change status to</label> 
>-        <select name="newstatus" onchange="document.changeform.knob[1].checked=true;">
>-          <option value="needinfo" title="Pending Vendor response">Pending Vendor Response</option>
>-          <option value="on_qa" title="Pending Reviewer Response">Pending Reviewer Response</option>
>-          <option value="modified" title="Pending TAM Response">Pending TAM Response</option>
>-          <option value="assigned" title="No Response Pending">No Response Pending</option>
>-        </select>
>-        <input type="hidden" name="needinfo_override" value="1"/>
>-        </th>
>-      </tr>
>-      [% IF user.login && UserInGroup('hwcert_edit') %]
>+      [% IF bug.bug_status != 'CLOSED' && user.login && UserInGroup('hwcert_edit') %]
>       <tr>
>         <th>
>         <input id="knob-resolve" type="radio" name="knob" value="resolve"/>
>         <label for="knob-resolve">
>-          Close certification, changing resolution to
>-          <select name="resolution" onchange="document.changeform.knob[1].checked=true;">
>-            <option value="CURRENTRELEASE">CERTIFIED</option>
>-            <option value="RAWHIDE">COMPATIBLE</option>
>-            <option value="WONTFIX">UNCERTIFIED</option>
>-          </select>
>+          Close Certification, as CERTIFIED
>+          <input type="hidden" name="resolution" value="CURRENTRELEASE">
>         </label>
>         </th>
>       </tr>
>       [% END %]
>-      [% END %]
> 
>       </table>
>       </p>
>Index: template/en/default/bug/tam_ack.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/tam_ack.html.tmpl,v
>retrieving revision 1.3
>diff -u -r1.3 tam_ack.html.tmpl
>--- template/en/default/bug/tam_ack.html.tmpl	21 Jul 2008 06:11:05 -0000	1.3
>+++ template/en/default/bug/tam_ack.html.tmpl	25 Jul 2008 22:59:36 -0000
>@@ -1,11 +1,12 @@
> 
>     [% IF ( (user.login && user.login == bug.reporter.login) || UserInGroup('hwcert_edit') ) %] 
>       [% IF UserInGroup('support') || UserInGroup('hwcert_edit')%]
>+<hr>
>       <h2>GSS Requirements</h2>
> 
>       <table>
>       <tr>
>-         <th COLSPAN=2>TAM ACK</th>
>+         <th COLSPAN=2>GSS/TAM ACK</th>
>       </tr>
>       <tr>
>          <td><input type=checkbox name=tam_ack value=public [% " CHECKED" IF bug.tam_ack == 'public' %] [% " DISABLED" IF !UserInGroup('support') %] ></td>
>Index: template/en/default/bug/needinfo_flag.html.tmpl
>===================================================================
>RCS file: template/en/default/bug/needinfo_flag.html.tmpl
>diff -N template/en/default/bug/needinfo_flag.html.tmpl
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ template/en/default/bug/needinfo_flag.html.tmpl	29 Jul 2008 18:41:26 -0000
>@@ -0,0 +1,77 @@
>+[% ## Starting with the Bugzilla3 push, needinfo is no longer a bug status %]
>+[% ## but instead it is tracked as a flag with a requestee as applicable.  %]
>+[% ## The follow masks off the needinfo flag as if it were dialog status.  %]
>+
>+[% ## Borrowed from change to address Bug #406451, also suggested by Noura %]
>+[% needinfo_flag_id = 0 %]
>+[% needinfo_flag_name = 'flag_type' %]
>+[% needinfo_flag_status = '' %]
>+[% needinfo_flag_requestee = '' %]
>+[% needinfo_requestee_name = 'requestee_type' %]
>+[% FOREACH type = bug.flag_types %]
>+  [% IF type.name == 'needinfo' %]
>+    [% needinfo_flag_type_id = type.id %]
>+    [% FOREACH flag = type.flags %]
>+      [% IF flag.status %]
>+        [% needinfo_flag_id = flag.id %]
>+        [% needinfo_flag_status = flag.status %]
>+        [% needinfo_requestee = 'requestee' %]
>+      [% END %]
>+      [% needinfo_flag_requestee = flag.requestee %]
>+    [% END %]
>+  [% END %]
>+[% END %]
>+
>+
>+[% ## The naming convention of the form elements changes depending on the     %]
>+[% ## flag already existing and just needing to be updated or if the flag     %]
>+[% ## needs to be created, User.pm figure this out based on if _type prefixes %]
>+[% ## the -{number}.  If type is there the number is the flag type ID; if not %]
>+[% ## the number is the flag to update ID.                                    %]
>+[% ##                                                                         %]
>+[% ## This naming convention seems to cause firefox to balk at the javascript %]
>+[% ## code to auto select the radio's based on the dash in the element name   %]
>+[% ## where flag_type-16 errors but flag_type16 works fine in the form but    %]
>+[% ## of course fails when User.pm tried to process it.  We may revisit this. %]
>+
>+<p>
>+[% IF needinfo_flag_id %]
>+<input type="radio" name="flag-[% needinfo_flag_id %]"
>+       id="flag-[% needinfo_flag_id %]" value="X">
>+[% ELSE %]
>+<input type="radio" name="flag_type-[% needinfo_flag_type_id %]"
>+       id="flag_type-[% needinfo_flag_type_id %]" value="X" checked>
>+[% END %]
>+  <label>No response requested</label>
>+
>+<p>
>+[% IF needinfo_flag_id %]
>+<input type="radio" name="flag-[% needinfo_flag_id %]"
>+       id="flag-[% needinfo_flag_id %]" value="?" checked>
>+[% ELSE %]
>+<input type="radio" name="flag_type-[% needinfo_flag_type_id %]"
>+       id="flag_type-[% needinfo_flag_type_id %]" value="?">
>+[% END %]
>+  <label>Request Information From: </label>
>+
>+<br>
>+[% IF needinfo_flag_id %]
>+<select name="requestee-[% needinfo_flag_id %]" 
>+        id="requestee-[% needinfo_flag_id %]"
>+        style="margin-left: 25px;">
>+[% ELSE %]
>+<select name="requestee_type-[% needinfo_flag_type_id %]"
>+        id="requestee_type-[% needinfo_flag_type_id %]"
>+        style="margin-left: 25px;">
>+[% END %]
>+  <option value="[% bug.reporter.login %]"
>+    [% " selected" IF bug.reporter.login == needinfo_flag_requestee.login %]>
>+    [% bug.reporter.name %] (Submitter)</option>
>+  <option value="[% bug.qa_contact.login %]"
>+    [% " selected" IF bug.qa_contact.login == needinfo_flag_requestee.login %]>
>+    [% bug.qa_contact.name %] (GSS/TAM)</option>
>+  <option value="[% bug.assigned_to.login %]"
>+    [% " selected" IF bug.assigned_to.login == needinfo_flag_requestee.login %]>
>+    [% bug.assigned_to.name %] (Reviewer)</option>
>+</select>
>+

Actions: View | Diff

Attachments on bug 454593: 312231 | 312356 | 312360 | 312381 | 312413 | 312693 | 312921