Attachment 312356 Details for Bug 454593 – patch to fix (1)-(5) entries in comment#5

[patch] patch to fix (1)-(5) entries in comment#5

bug454536-1.patch (text/plain), 4.99 KB, created by eric_liu on 2008-07-22 14:57:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: eric_liu

Created: 2008-07-22 14:57:10 UTC

Size: 4.99 KB

patch

obsolete

>Index: template/en/default/bug/edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/edit.html.tmpl,v
>retrieving revision 1.59
>diff -u -r1.59 edit.html.tmpl
>--- template/en/default/bug/edit.html.tmpl	29 Feb 2008 12:09:38 -0000	1.59
>+++ template/en/default/bug/edit.html.tmpl	22 Jul 2008 14:38:45 -0000
>@@ -64,15 +64,18 @@
>       [% 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
>          external_bugzilla_list = bug.external_bugzilla_list %]
>+      [%# PROCESS bug/dialog_status.html.tmpl %]
>     </div>
> 
>     <div id="dialog">
>       [% PROCESS "bug/certification-comments.html.tmpl" %]
>-      [% PROCESS bug/status_edit.html.tmpl %]
>+      [%# PROCESS bug/certification_status.html.tmpl %]
>+      [%# PROCESS bug/status_edit.html.tmpl %]
>     </div>
> 
>     <div id="review">
>
>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	22 Jul 2008 14:38:46 -0000
>@@ -4,24 +4,12 @@
> 
>       <hr/>
> 
>-      <h3>Edit Dialog Status</h3>
>+      <h3>Certification 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 %]
>+      [% IF bug.bug_status != 'CLOSED' %]    
>+           [% tmp.status = 'In Progress' %]
>       [% ELSE %]
>-        [% tmp.status = bug.bug_status %]
>+        [% tmp.status = 'Closed Certification As' %]
>       [% END %]
> 
>       [% IF bug.resolution == 'CURRENTRELEASE' %]
>@@ -40,7 +28,7 @@
>         <th>
>         <input type="radio" id="knob-leave" name="knob" value="none" checked="checked">
>         <label for="knob-leave">
>-          Leave as <b>[% tmp.status %][% IF bug.bug_status == 'CLOSED' %]&nbsp;[% tmp.resolution %][% END %]</b>
>+          <b>[% tmp.status %][% IF bug.bug_status == 'CLOSED' %]&nbsp;[% tmp.resolution %][% END %]</b>
>         </label>
>         </th>
>       </tr>
>@@ -50,7 +38,7 @@
>         <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>
>+        <label for="knob-changestatus">Re-Open Certification</label>
>         </th>
>       </tr>
>          [% IF !UserInGroup('hwcert_edit') && !isprivate %] 
>@@ -63,30 +51,13 @@
>       [% 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') %]
>       <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 This Certification
>+          <input type="hidden" name="resolution" value="CURRENTRELEASE" />
>         </label>
>         </th>
>       </tr>

Actions: View | Diff

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