Helix SwarmHelix Swarm

bugzilla-2.16.1-patch

  • //
  • guest/
  • charles_hardin/
  • p4dti/
  • bugzilla-2.16.1-patch #1
  • View
  • Commits
  • Open Download .zip Download (29 KB) 
  1. diff -r -u -N /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/bug_form.pl ./bug_form.pl
  2. --- /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/bug_form.pl	Fri Nov  1 11:11:22 2002
  3. +++ ./bug_form.pl	Fri Nov  1 11:10:50 2002
  4. @@ -28,6 +28,167 @@
  5.  # Use the Attachment module to display attachments for the bug.
  6.  use Attachment;
  7.  
  8. +# Prepare a hash for the section of the bug form showing information
  9. +# replicated from the Perforce source code management system by the
  10. +# P4DTI replicator.  Derived from code contributed by Matt Albrecht
  11. +# <matt.albrecht@zilliant.com>.
  12. +
  13. +sub PreparePerforceSection {
  14. +    my ($bug_id) = (@_);
  15. +    my $jobname;
  16. +    my %p4dti;
  17. +    $p4dti{'hasp4dti'} = 0;
  18. +    if (Param("p4dti")) {
  19. +        $p4dti{'hasp4dti'} = 1;
  20. +        
  21. +        # First get the row from p4dti_bugs showing whether or not this bug is
  22. +        # replicated at all.
  23. +        SendSQL("SELECT rid, sid, jobname FROM p4dti_bugs " .
  24. +            "WHERE bug_id = $bug_id");
  25. +        if (!MoreSQLData()) {
  26. +            $p4dti{'isreplicated'} = 0;
  27. +        } else {
  28. +            $p4dti{'isreplicated'} = 1;
  29. +            
  30. +            ($p4dti{'rid'}, $p4dti{'sid'}, $jobname) =
  31. +                (FetchSQLData());
  32. +
  33. +            # Replicating a bug more than once (i.e. to more than one
  34. +            # Perforce server or via more than one replicator) is
  35. +            # currently not supported by the replication system.
  36. +            if (MoreSQLData()) {
  37. +                my ($other_rid, $other_sid) = (FetchSQLData());
  38. +                die "bug $bug_id is replicated by (".$p4dti{'rid'}.", ".
  39. +                    $p4dti{'sid'}.") and ($other_rid, $other_sid).";
  40. +            }
  41. +
  42. +            # Get P4DTI config for this rid/sid combination
  43. +            my %p4dti_config;
  44. +            SendSQL("SELECT config_key, config_value FROM p4dti_config " .
  45. +                "WHERE rid = " . SqlQuote($p4dti{'rid'}) . " AND sid = " .
  46. +                SqlQuote($p4dti{'sid'}));
  47. +            while(MoreSQLData()) {
  48. +                my ($p4dti_config_key, $p4dti_config_value) = FetchSQLData();
  49. +                $p4dti_config{$p4dti_config_key} = $p4dti_config_value;
  50. +            }
  51. +            if (!defined $p4dti_config{'p4_server_description'}) {
  52. +                $p4dti_config{'p4_server_description'} = "";
  53. +            }
  54. +            if (!defined $p4dti_config{'changelist_url'}) {
  55. +                $p4dti_config{'changelist_url'} = "";
  56. +            }
  57. +            if (!defined $p4dti_config{'job_url'}) {
  58. +                $p4dti_config{'job_url'} = "";
  59. +            }
  60. +            if (!defined $p4dti_config{'replicator_user'}) {
  61. +                $p4dti_config{'replicator_user'} = "";
  62. +            }
  63. +            $p4dti{'config'} = \%p4dti_config;
  64. +            
  65. +            $jobname = value_quote($jobname);
  66. +            if ($p4dti_config{"job_url"} ne "") {
  67. +                $p4dti{'jobname'} = sprintf("<a href=\"$p4dti_config{'job_url'}\">$jobname</a>", $jobname);
  68. +            } else { # no job URL pattern.
  69. +                $p4dti{'jobname'} = $jobname;
  70. +            }
  71. +
  72. +            # Get actual fixes.
  73. +            # Every row in the p4dti_fixes table with the right bug_id
  74. +            # is a fix for this bug.  We have to match that up with a row
  75. +            # in the p4dti_changelist table, to get the fix description.
  76. +            # However, if there are multiple replicators running,
  77. +            # there may be more than one row in the p4dti_changelist
  78. +            # table with a given changelist number.  So we make
  79. +            # the SIDs (Perforce server IDs) match.
  80. +            #
  81. +            # We do a LEFT JOIN and get a not-NULL field (the rid)
  82. +            # from the p4dti_changelists table so we can distinguish
  83. +            # the cases in which there is not a p4dti_changelists row
  84. +            # for this changelist.  That indicates a failure in the
  85. +            # replicator, so we want to know about it.
  86. +            SendSQL("SELECT profiles.realname, profiles.login_name, " .
  87. +                    "    p4dti_fixes.changelist, " .
  88. +                    "    p4dti_fixes.status, p4dti_changelists.p4date, " .
  89. +                    "    p4dti_changelists.description, p4dti_changelists.rid, " .
  90. +                    "    p4dti_changelists.flags " .
  91. +                    "FROM p4dti_fixes, profiles " .
  92. +                    "LEFT JOIN p4dti_changelists " .
  93. +                    "       ON (p4dti_changelists.changelist=p4dti_fixes.changelist" .
  94. +                    "           AND p4dti_changelists.sid = p4dti_fixes.sid)" .
  95. +                    "WHERE p4dti_fixes.bug_id = $bug_id " .
  96. +                    "  AND profiles.userid = p4dti_fixes.user " .
  97. +                    "  AND p4dti_fixes.rid = ". SqlQuote($p4dti{'rid'}) .
  98. +                    "  AND p4dti_changelists.rid = ". SqlQuote($p4dti{'rid'}) .
  99. +                    "  AND p4dti_fixes.sid = ". SqlQuote($p4dti{'sid'}) .
  100. +                    "  AND p4dti_changelists.sid = ". SqlQuote($p4dti{'sid'}) .
  101. +                    " ORDER BY p4dti_fixes.changelist");
  102. +            if (MoreSQLData()) {
  103. +                $p4dti{'hasfixes'} = 1;
  104. +                my @fixlist;
  105. +                while (MoreSQLData()) {
  106. +                    my %myset;
  107. +                    my ($realname, $login_name, $changelist, $status, $p4date,
  108. +                    $description, $changelist_rid, $changelist_flags) =
  109. +                        (FetchSQLData());
  110. +                    if (!defined $changelist_rid || $changelist_rid eq "") {
  111. +                        die "p4dti_changelists has no row for changelist $changelist.";
  112. +                    }
  113. +                    $myset{'changelist_rid'} = $changelist_rid;
  114. +                    $myset{'description'} = $description || "(none)";
  115. +                    if ($changelist) {
  116. +                        my $changelist_html;
  117. +                        if ($p4dti_config{"changelist_url"} ne "") {
  118. +                            $myset{'changelist'} =
  119. +                                sprintf("<a href=\"$p4dti_config{'changelist_url'}\">$changelist</a>",
  120. +                                        $changelist);
  121. +                        } else { # no changelist URL pattern.
  122. +                            $myset{'changelist'} = $changelist;
  123. +                        }
  124. +                    } else {
  125. +                        $myset{'changelist'} = "";
  126. +                    }
  127. +                    if ($changelist_flags & 1) {
  128. +                        $myset{'changelist_note'} = "";
  129. +                    } else {
  130. +                        $myset{'changelist_note'} = "(pending)";
  131. +                    }
  132. +                    if ($login_name eq $p4dti_config{"replicator_user"}) {
  133. +                        $myset{'user_field'} = "(unknown)";
  134. +                    } else {
  135. +                        $myset{'user_field'} = ("<a href=\"mailto:$login_name\">" .
  136. +                                   value_quote($realname) . "</a>");
  137. +                    }
  138. +                    $myset{'status'} = $status || "";
  139. +                    $myset{'p4date'} = $p4date || "";
  140. +                    
  141. +                    push( @fixlist, \%myset );
  142. +                }
  143. +                $p4dti{'fixes'} = \@fixlist;
  144. +            } else {
  145. +                $p4dti{'hasfixes'} = 0;
  146. +            }
  147. +            # get filespecs.
  148. +            SendSQL("SELECT filespec " .
  149. +                "FROM p4dti_filespecs " .
  150. +                "WHERE bug_id = $bug_id");
  151. +            if (MoreSQLData()) {
  152. +                $p4dti{'hasfilespecs'} = 1;
  153. +                my @speclist;
  154. +                while (MoreSQLData()) {
  155. +                    my ($filespec) = (FetchSQLData());
  156. +                    push( @speclist, $filespec );
  157. +                }
  158. +                $p4dti{'filespecs'} = \@speclist;
  159. +            } else {
  160. +                $p4dti{'hasfilespecs'} = 0;
  161. +            }
  162. +        }
  163. +    }
  164. +    return \%p4dti;
  165. +}
  166. +
  167. +
  168. +
  169.  sub show_bug {    
  170.      # Shut up misguided -w warnings about "used only once".  For some reason,
  171.      # "use vars" chokes on me when I try it here.
  172. @@ -313,6 +474,8 @@
  173.      # Add the bug and user hashes to the variables
  174.      $vars->{'bug'} = \%bug;
  175.      $vars->{'user'} = \%user;
  176. +    
  177. +    $vars->{'p4dti'} = PreparePerforceSection($bug{'bug_id'});
  178.  
  179.      # Create the <link> elements for browsing bug lists
  180.      $vars->{'navigation_links'} = navigation_links(join(':',@bug_list));
  181. diff -r -u -N /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/defparams.pl ./defparams.pl
  182. --- /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/defparams.pl	Fri Nov  1 11:11:22 2002
  183. +++ ./defparams.pl	Fri Nov  1 11:10:50 2002
  184. @@ -607,4 +607,9 @@
  185.           "t" , 
  186.           '1000');
  187.  
  188. +DefParam("p4dti",
  189. +         "If this is on, Bugzilla uses the Perforce Defect Tracking Integration.",
  190. +         "b",
  191. +         0);
  192. +
  193.  1;
  194. diff -r -u -N /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/doeditparams.cgi ./doeditparams.cgi
  195. --- /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/doeditparams.cgi	Fri Nov  1 11:11:23 2002
  196. +++ ./doeditparams.cgi	Fri Nov  1 11:10:51 2002
  197. @@ -26,6 +26,7 @@
  198.  use lib qw(.);
  199.  
  200.  require "CGI.pl";
  201. +require "globals.pl";
  202.  require "defparams.pl";
  203.  
  204.  # Shut up misguided -w warnings about "used only once":
  205. @@ -74,6 +75,41 @@
  206.  }
  207.  
  208.  
  209. +####
  210. +# ndl@ravenbrook.com 2001-11-23:
  211. +# If the parameters table did not exist, create and populate it.
  212. +# If a parameters table is incorporated into the main Bugzilla sources
  213. +# then it should be created and initially populated from this
  214. +# checksetup.pl, and merely updated in this file.
  215. +
  216. +SendSQL ("SHOW TABLES LIKE 'p4dti_bugzilla_parameters'");
  217. +if (MoreSQLData()) {
  218. +    print("Updating table p4dti_bugzilla_parameters.<br>\n");
  219. +} else {
  220. +    print("Creating table p4dti_bugzilla_parameters.<br>\n");
  221. +    SendSQL("CREATE TABLE p4dti_bugzilla_parameters
  222. +             (parameter_name varchar(255) not null primary key,
  223. +              parameter_value mediumtext)");
  224. +}
  225. +
  226. +foreach my $i (@::param_list) {
  227. +    my $val = SqlQuote($::param{$i});
  228. +    SendSQL("SELECT parameter_value
  229. +             FROM p4dti_bugzilla_parameters
  230. +             WHERE parameter_name = '$i'");
  231. +    if (MoreSQLData()) {
  232. +        SendSQL("UPDATE p4dti_bugzilla_parameters
  233. +                 SET parameter_value = $val
  234. +                 WHERE parameter_name = '$i'");
  235. +    } else {
  236. +        SendSQL("INSERT INTO p4dti_bugzilla_parameters
  237. +                 VALUES ('$i', $val)");
  238. +    }
  239. +}
  240. +
  241. +#
  242. +####
  243. +
  244.  WriteParams();
  245.  
  246.  unlink "data/versioncache";
  247. diff -r -u -N /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/template/en/custom/bug/edit.html.tmpl ./template/en/custom/bug/edit.html.tmpl
  248. --- /home/nb/info.ravenbrook.com/project/p4dti/import/2002-09-30/bugzilla-2.16.1/bugzilla-2.16.1/template/en/custom/bug/edit.html.tmpl	Thu Jan  1 01:00:00 1970
  249. +++ ./template/en/custom/bug/edit.html.tmpl	Fri Nov  1 11:10:51 2002
  250. @@ -0,0 +1,624 @@
  251. +<!-- 1.0@bugzilla.org -->
  252. +[%# The contents of this file are subject to the Mozilla Public
  253. +  # License Version 1.1 (the "License"); you may not use this file
  254. +  # except in compliance with the License. You may obtain a copy of
  255. +  # the License at http://www.mozilla.org/MPL/
  256. +  #
  257. +  # Software distributed under the License is distributed on an "AS
  258. +  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
  259. +  # implied. See the License for the specific language governing
  260. +  # rights and limitations under the License.
  261. +  #
  262. +  # The Original Code is the Bugzilla Bug Tracking System.
  263. +  #
  264. +  # The Initial Developer of the Original Code is Netscape Communications
  265. +  # Corporation. Portions created by Netscape are
  266. +  # Copyright (C) 1998 Netscape Communications Corporation. All
  267. +  # Rights Reserved.
  268. +  #
  269. +  # Contributor(s): Gervase Markham <gerv@gerv.net>
  270. +  #%]
  271. +
  272. +[% filtered_desc = bug.short_desc FILTER html %]
  273. +[% UNLESS header_done %]
  274. +  [% PROCESS global/header.html.tmpl 
  275. +    title = "Bug $bug.bug_id - $bug.short_desc"
  276. +    h1 = "Bugzilla Bug $bug.bug_id"
  277. +    h2 = filtered_desc
  278. +    header_html = navigation_links
  279. +   %]
  280. +[% END %]
  281. +
  282. +[% PROCESS bug/navigate.html.tmpl %]
  283. +
  284. +<hr>
  285. +
  286. +<form name="changeform" method="post" action="process_bug.cgi">
  287. +
  288. +  <input type="hidden" name="delta_ts" value="[% bug.delta_ts %]">
  289. +  <input type="hidden" name="longdesclength" value="[% bug.longdesclength %]">
  290. +  <input type="hidden" name="id" value="[% bug.bug_id %]">
  291. +
  292. +[%# *** Platform Reporter Product OS AddCC *** %]
  293. +
  294. +  <table cellspacing="1" cellpadding="1" border="0">
  295. +    <tr>      
  296. +      <td align="right">
  297. +        <b>Bug#:</b>
  298. +      </td>
  299. +      <td>
  300. +        <a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]">
  301. +          [% bug.bug_id %]</a>
  302. +      </td>
  303. +      
  304. +      <td>&nbsp;</td>
  305. +
  306. +      <td align="right">
  307. +        <b>Platform:</b>
  308. +      </td>
  309. +      [% PROCESS select selname = "rep_platform" %]
  310. +      
  311. +      <td align="right">
  312. +        <b>Reporter:</b>
  313. +      </td>
  314. +      <td>
  315. +        [% bug.reporter FILTER html %]
  316. +      </td>    
  317. +    </tr>
  318. +    
  319. +    <tr>
  320. +      <td align="right">
  321. +        <b>Product:</b>
  322. +      </td>
  323. +      [% PROCESS select selname => "product" %]
  324. +      
  325. +      <td align="right">
  326. +        <b>OS:</b>
  327. +      </td>
  328. +      [% PROCESS select selname => "op_sys" %]
  329. +
  330. +      <td align="right">
  331. +        <b>Add&nbsp;CC:</b>
  332. +      </td>
  333. +      <td>
  334. +        <input name="newcc" size="30" value="">
  335. +      </td>
  336. +    </tr>
  337. +
  338. +[%# *** Component Version CC Priority Severity AssignedTo Milestone *** %]    
  339. +
  340. +    <tr>
  341. +      <td align="right">
  342. +        <b>
  343. +          <a href="describecomponents.cgi?product=[% bug.product FILTER url_quote %]">
  344. +            Component</a>:
  345. +        </b>
  346. +      </td>
  347. +      <td>
  348. +        <select name="component">
  349. +          [% FOREACH x = component_ %]
  350. +            <option value="[% x FILTER html %]"
  351. +              [% " selected" IF x == bug.component %]>[% x FILTER html %]
  352. +            </option>
  353. +          [% END %]
  354. +        </select>
  355. +      </td>
  356. +
  357. +      <td>&nbsp;</td>
  358. + 
  359. +      <td align="right">
  360. +        <b>Version:</b>
  361. +      </td>
  362. +      [% PROCESS select selname => "version"  %]
  363. +      
  364. +      <td rowspan="4" align="right" valign="top">
  365. +        <b>CC:</b>
  366. +      </td>
  367. +      <td rowspan="4" valign="top"> 
  368. +      [% IF bug.cc %]
  369. +        <select name="cc" multiple="multiple" size="5">
  370. +        [% FOREACH c = bug.cc %]
  371. +          <option value="[% c FILTER html %]">[% c FILTER html %]</option>
  372. +        [% END %]
  373. +        </select>
  374. +        <br>
  375. +        <input type="checkbox" name="removecc">Remove selected CCs
  376. +        <br>
  377. +      [% ELSE %]
  378. +        <input type="hidden" name="cc" value="">
  379. +      [% END %]
  380. +      </td>
  381. +    </tr>
  382. +    
  383. +    <tr>
  384. +      <td align="right">
  385. +        <b>
  386. +          <a href="bug_status.html">Status</a>:
  387. +        </b>
  388. +      </td>
  389. +      <td>[% bug.bug_status FILTER html %]</td>      
  390. +      <td>&nbsp;</td>
  391. +      
  392. +      <td align="right">
  393. +        <b><a href="bug_status.html#priority">Priority</a>:</b>
  394. +      </td>
  395. +      [% PROCESS select selname => "priority" %]
  396. +    </tr>
  397. +    
  398. +    <tr>
  399. +      <td align="right">
  400. +        <b>
  401. +          <a href="bug_status.html">Resolution</a>:
  402. +        </b>
  403. +      </td>
  404. +      <td>[% bug.resolution FILTER html %]</td>      
  405. +      <td>&nbsp;</td>
  406. +      
  407. +      <td align="right">
  408. +        <b><a href="bug_status.html#severity">Severity</a>:</b>
  409. +      </td>
  410. +      [% PROCESS select selname = "bug_severity" %]
  411. +      
  412. +    </tr>
  413. +    
  414. +    <tr>
  415. +      <td align="right">
  416. +        <b>
  417. +          <a href="bug_status.html#assigned_to">Assigned&nbsp;To</a>:
  418. +        </b>
  419. +      </td>
  420. +      <td>[% bug.assigned_to FILTER html %]</td>
  421. +      <td>&nbsp;</td>
  422. + 
  423. +      [% IF Param("usetargetmilestone") && bug.target_milestone %]
  424. +        <td align="right">
  425. +          <b>
  426. +            <a href="[% bug.milestoneurl FILTER html %]">Target Milestone</a>:
  427. +          </b>
  428. +        </td>
  429. +        [% PROCESS select selname = "target_milestone" %]
  430. +      [% ELSE %]
  431. +        <td colspan="3">&nbsp;</td>
  432. +      [% END %]
  433. +    </tr>
  434. +
  435. +[%# *** QAContact URL Summary Whiteboard Keywords *** %]
  436. +
  437. +   [% IF Param('useqacontact') %]
  438. +     <tr>
  439. +       <td align="right">
  440. +       <b>QA Contact:</b>
  441. +       </td>
  442. +       <td colspan="7">
  443. +         <input name="qa_contact" 
  444. +                value="[% bug.qa_contact FILTER html %]" size="60">
  445. +       </td>
  446. +     </tr>
  447. +   [% END %]
  448. +
  449. +  <tr>
  450. +    <td align="right">
  451. +      <b>
  452. +        [% IF bug.bug_file_loc %]
  453. +          <a href="[% bug.bug_file_loc FILTER html %]">URL</a>:
  454. +        [% ELSE %]
  455. +          URL:
  456. +        [% END %]
  457. +      </b>
  458. +    </td>
  459. +    <td colspan="7">
  460. +      <input name="bug_file_loc" 
  461. +             value="[% bug.bug_file_loc FILTER html %]" size="60">
  462. +    </td>
  463. +  </tr>
  464. +  
  465. +  <tr>
  466. +    <td align="right">
  467. +      <b>Summary:</b>
  468. +    </td>
  469. +    <td colspan="7">
  470. +      <input name="short_desc" 
  471. +             value="[% bug.short_desc FILTER html %]" size="60">
  472. +    </td>
  473. +  </tr>
  474. +
  475. +  [% IF Param('usestatuswhiteboard') %] 
  476. +    <tr>
  477. +      <td align="right">
  478. +        <b>Status Whiteboard:</b>
  479. +      </td>
  480. +      <td colspan="7">
  481. +        <input name="status_whiteboard" 
  482. +               value="[% bug.status_whiteboard FILTER html %]" size="60">
  483. +      </td>
  484. +    </tr>
  485. +  [% END %]
  486. +
  487. +  [% IF use_keywords %]
  488. +    <tr>
  489. +      <td align="right">
  490. +        <b>
  491. +          <a href="describekeywords.cgi">Keywords</a>:
  492. +        </b>
  493. +      <td colspan="7">
  494. +        <input name="keywords" 
  495. +               value="[% bug.keywords.join(', ') FILTER html %]" size="60">
  496. +      </td>
  497. +    </tr> 
  498. +  [% END %]
  499. +  </table>
  500. +  
  501. +[%# *** Attachments *** %]
  502. +
  503. +  [% PROCESS attachment/list.html.tmpl 
  504. +     attachments = bug.attachments 
  505. +     bugid = bug.bug_id %]
  506. +
  507. +[%# *** Dependencies Votes *** %]
  508. +
  509. +  [% IF Param('usedependencies') %]
  510. +  <table>
  511. +    <tr>
  512. +    [% PROCESS dependencies 
  513. +       dep = { title => "depends on", fieldname => "dependson" } %]
  514. +      <td rowspan="2">
  515. +        <a href="showdependencytree.cgi?id=[% bug.bug_id %]">Show 
  516. +        dependency tree</a>  
  517. +
  518. +        [% IF Param('webdotbase') %]  
  519. +          <br>
  520. +          <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">Show 
  521. +          dependency graph</a>
  522. +        [% END %]
  523. +      </td>
  524. +    </tr>
  525. +
  526. +    <tr>
  527. +    [% PROCESS dependencies 
  528. +       dep = { title => "blocks", fieldname => "blocked" } %]
  529. +    </tr>
  530. +  </table>
  531. +  [% END %]
  532. +
  533. +  [% IF use_votes %]
  534. +  <table>
  535. +    <tr>
  536. +      <th>
  537. +        <a href="votehelp.html">Votes</a>:
  538. +      </th>
  539. +      <td>
  540. +        [% bug.votes %]&nbsp;&nbsp;&nbsp;
  541. +        <a href="votes.cgi?action=show_bug&amp;bug_id=[% bug.bug_id %]">Show 
  542. +        votes for this bug</a>&nbsp;&nbsp;&nbsp;
  543. +        <a href="votes.cgi?action=show_user&amp;bug_id=[% bug.bug_id %]">Vote 
  544. +        for this bug</a>
  545. +      </td>
  546. +    </tr>
  547. +  </table>
  548. +  [% END %]
  549. +
  550. +[%# *** Comments Groups *** %]
  551. +
  552. +  <br>
  553. +  <b>Additional Comments:</b>
  554. +  <br>
  555. +  <textarea wrap="hard" name="comment" rows="10" cols="80"
  556. +            accesskey="c"></textarea>
  557. +  <br>
  558. +
  559. +  [% IF groups.size > 0 %]
  560. +    <br>
  561. +    <b>Only users in all of the selected groups can view this bug:</b>
  562. +    <br>
  563. +    <font size="-1">(Unchecking all boxes makes this a public bug.)</font>
  564. +    <br>
  565. +    <br>
  566. +
  567. +    [% FOREACH group = groups %]
  568. +      &nbsp;&nbsp;&nbsp;&nbsp;
  569. +      <input type="checkbox" name="bit-[% group.bit %]" value="1" 
  570. +        [% " checked=\"checked\"" IF group.ison %]
  571. +        [% " disabled=\"disabled\"" IF NOT group.ingroup %]>
  572. +      [% group.description %]
  573. +      <br>
  574. +    [% END %]
  575. +
  576. +    [% IF NOT user.inallgroups %]
  577. +      <b>
  578. +        Only members of a group can change the visibility of a bug for 
  579. +        that group
  580. +      </b>
  581. +    <br>
  582. +    [% END %]
  583. +
  584. +    [% IF bug.inagroup %]
  585. +      <p>
  586. +        <b>But users in the roles selected below can always view this bug:</b>
  587. +        <br>
  588. +        <small>
  589. +          (The assignee                                                
  590. +          [% IF (Param('useqacontact')) %]
  591. +             and QA contact
  592. +          [% END %]
  593. +          can always see a bug, and this section does not take effect unless 
  594. +          the bug is restricted to at least one group.)
  595. +        </small>
  596. +      </p>
  597. +
  598. +      <p>
  599. +        <input type="checkbox" name="reporter_accessible" value="1"
  600. +          [% " checked" IF bug.reporter_accessible %]>Reporter
  601. +        <input type="checkbox" name="cclist_accessible" value="1"
  602. +          [% " checked" IF bug.cclist_accessible %]>CC List
  603. +      </p>  
  604. +    [% END %]
  605. +  [% END %]
  606. +
  607. +[%# *** Knob *** %]
  608. +
  609. +  <br>
  610. +  <input type="radio" name="knob" value="none" checked="checked">
  611. +  Leave as <b>[% bug.bug_status FILTER html %]&nbsp;
  612. +              [% bug.resolution FILTER html %]</b>
  613. +  <br>
  614. +
  615. +  [% knum = 1 %]
  616. +
  617. +  [% IF bug.bug_status == "UNCONFIRMED" && 
  618. +        user.canconfirm %]
  619. +    <input type="radio" name="knob" value="confirm">
  620. +    Confirm bug (change status to <b>NEW</b>)
  621. +    <br>
  622. +    [% knum = knum + 1 %]
  623. +  [% END %]
  624. +
  625. +  [% IF user.canedit %]
  626. +    [% IF bug.isopened %]
  627. +      [% IF bug.bug_status != "ASSIGNED" && user.canconfirm %]
  628. +        <input type="radio" name="knob" value="accept">
  629. +        Accept bug (
  630. +        [% "confirm bug, " IF bug.isunconfirmed %]change
  631. +        status to <b>ASSIGNED</b>)
  632. +        <br>
  633. +        [% knum = knum + 1 %]
  634. +      [% END %]
  635. +
  636. +      [% IF bug.resolution %]
  637. +        <input type="radio" name="knob" value="clearresolution">
  638. +        Clear the resolution (remove the current resolution of
  639. +        <b>[% bug.resolution FILTER html %]</b>)<br>      
  640. +        [% knum = knum + 1 %]
  641. +      [% END %]
  642. +
  643. +      <input type="radio" name="knob" value="resolve">
  644. +      Resolve bug, changing <a href="bug_status.html">resolution</a> to
  645. +      <select name="resolution" 
  646. +              onchange="document.changeform.knob[[% knum %]].checked=true">
  647. +      [% FOREACH r = resolution %]
  648. +        <option value="[% r FILTER html %]">[% r FILTER html %]</option>
  649. +      [% END %]
  650. +      </select>
  651. +      <br>
  652. +      [% knum = knum + 1 %]
  653. +
  654. +      <input type="radio" name="knob" value="duplicate">
  655. +      Resolve bug, mark it as duplicate of bug # 
  656. +      <input name="dup_id" size="6" 
  657. +             onchange="if (this.value != '')
  658. +                       {document.changeform.knob[[% knum %]].checked=true}">
  659. +      <br>
  660. +      [% knum = knum + 1 %]
  661. +
  662. +      <input type="radio" name="knob" value="reassign"> 
  663. +      <a href="bug_status.html#assigned_to">Reassign</a> bug to
  664. +      <input name="assigned_to" size="32" 
  665. +             onchange="if ((this.value != '[% bug.assigned_to_email FILTER js %]') && 
  666. +                            (this.value != '')) {
  667. +                         document.changeform.knob[[% knum %]].checked=true; 
  668. +                       }"  
  669. +             value="[% bug.assigned_to_email FILTER html %]">
  670. +      <br>
  671. +      [% IF bug.isunconfirmed && user.canconfirm %]
  672. +        &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="andconfirm">
  673. +        and confirm bug (change status to <b>NEW</b>)
  674. +        <br>
  675. +      [% END %]
  676. +      [% knum = knum + 1 %]
  677. +
  678. +      <input type="radio" name="knob" value="reassignbycomponent">
  679. +      Reassign bug to owner
  680. +      [% "and QA contact" IF useqacontact %]
  681. +      of selected component
  682. +      <br>
  683. +      [% IF bug.isunconfirmed && user.canconfirm %]
  684. +        &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="compconfirm">
  685. +        and confirm bug (change status to <b>NEW</b>)
  686. +        <br>
  687. +      [% END %]
  688. +      [% knum = knum + 1 %]
  689. +    [% ELSE %]
  690. +      [% IF bug.resolution != "MOVED" ||
  691. +           (bug.resolution == "MOVED" && user.canmove) %]  
  692. +        <input type="radio" name="knob" value="reopen"> Reopen bug
  693. +        <br>
  694. +        [% knum = knum + 1 %]
  695. +      [% END %]
  696. +      [% IF bug.bug_status == "RESOLVED" %]
  697. +        <input type="radio" name="knob" value="verify">
  698. +        Mark bug as <b>VERIFIED</b><br>
  699. +        [% knum = knum + 1 %]
  700. +      [% END %]
  701. +      [% IF bug.bug_status != "CLOSED" %]
  702. +        <input type="radio" name="knob" value="close">
  703. +        Mark bug as <b>CLOSED</b><br>
  704. +        [% knum = knum + 1 %]
  705. +      [% END %]
  706. +    [% END %]
  707. +  [% END %]  
  708. +  
  709. +  <input type="submit" value="Commit">
  710. +  <input type="hidden" name="form_name" value="process_bug">
  711. +  <p>
  712. +    <font size="+1">
  713. +      <b>
  714. +        <a href="show_activity.cgi?id=[% bug.bug_id %]">View Bug Activity</a>
  715. +        &nbsp; | &nbsp;
  716. +        <a href="long_list.cgi?buglist=[% bug.bug_id %]">Format For Printing</a>
  717. +      </b>
  718. +    </font>
  719. +
  720. +    [% IF user.canmove %]
  721. +      &nbsp; <font size="+1"><b> | </b></font> &nbsp;
  722. +      <input type="submit" name="action" 
  723. +             value="[% Param("move-button-text") %]">
  724. +    [% END %]
  725. +  </p>  
  726. +</form>
  727. +
  728. +[%# *** Additional Comments *** %]
  729. +
  730. +<table>
  731. +  <tr>
  732. +    <td align="left">
  733. +      <b>
  734. +        <a name="c0" href="#c0">Description</a>:
  735. +      </b>
  736. +    </td>
  737. +    <td align="right" width="100%">
  738. +      Opened: [% bug.creation_ts %]
  739. +    </td>
  740. +  </tr>
  741. +</table>
  742. +<hr>
  743. +
  744. +[% PROCESS bug/comments.html.tmpl 
  745. +   comments = bug.comments 
  746. + %]
  747. +  
  748. +<hr>
  749. +
  750. +[%# P4DTI section.  Derived in part from code contributed by Matt
  751. +  # Albrecht <matt.albrecht@zilliant.com>.
  752. +  #%]
  753. +[% IF p4dti.hasp4dti %]
  754. +    <div class="p4dti">
  755. +
  756. +    [% IF p4dti.isreplicated %]
  757. +    
  758. +        <p><b>Perforce replication:</b></p>
  759. +        <table border="0" cellspacing="0" cellpadding="4">
  760. +            <tr valign="top">
  761. +                <td><b>Job</b></td>
  762. +                <td> [% p4dti.jobname %] </td>
  763. +            </tr>
  764. +            <tr valign="top">
  765. +              <td><b>Server</b></td>
  766. +              <td>
  767. +                [% p4dti.sid FILTER html %]
  768. +                [% IF p4dti.config.p4_server_description %]:
  769. +                [% p4dti.config.p4_server_description FILTER html %]
  770. +                [% END %]
  771. +              </td>
  772. +            </tr>
  773. +            <tr valign="top">
  774. +              <td><b>Replicator ID</b></td>
  775. +              <td>[% p4dti.rid FILTER html %]</td>
  776. +            </tr>
  777. +            <tr valign="top">
  778. +              <td><b>Fixes</b></td>
  779. +              <td>
  780. +              [% IF p4dti.hasfixes %]
  781. +                <table border="1" cellspacing="0" cellpadding="4">
  782. +                  <tr align="left" valign="top">
  783. +                    <th>Change</th>
  784. +                    <th>Effect</th>
  785. +                    <th>Date</th>
  786. +                    <th>User</th>
  787. +                    <th>Description</th>
  788. +                  </tr>
  789. +                [% FOREACH fix = p4dti.fixes %]
  790. +                  <tr valign="top">
  791. +                    <td>[% fix.changelist %]
  792. +                    [% fix.changelist_note %]</td>
  793. +                    <td>[% fix.status FILTER html %]</td>
  794. +                    <td>[% fix.p4date FILTER html %]</td>
  795. +                    <td>[% fix.user_field %]</td>
  796. +                    <td>[% fix.description FILTER html %]</td>
  797. +                  </tr>
  798. +                [% END %]
  799. +                </table>
  800. +              [% ELSE %]
  801. +                None.
  802. +              [% END %]
  803. +              </td>
  804. +            </tr>
  805. +            <tr valign="top">
  806. +              <td><b>Filespecs</b></td>
  807. +              <td>
  808. +              [% IF p4dti.hasfilespecs %]
  809. +                <table>
  810. +                [% FOREACH f = p4dti.filespecs %]
  811. +                  <tr valign="top">
  812. +                    <td>[% f FILTER html %]</td>
  813. +                  </tr>
  814. +                [% END %]
  815. +                </table>
  816. +              [% ELSE %]
  817. +                None.
  818. +              [% END %]
  819. +              </td>
  820. +            </tr>
  821. +        </table>
  822. +    
  823. +    [% ELSE %]
  824. +
  825. +        <p><b>Not replicated in Perforce.</b></p>
  826. +    
  827. +    [% END %]
  828. +    <hr/>
  829. +    </div>
  830. +[% END %]
  831. +
  832. +<hr>
  833. +
  834. +[% PROCESS bug/navigate.html.tmpl %]
  835. +
  836. +<br>
  837. +
  838. +[% PROCESS global/footer.html.tmpl %]
  839. +
  840. +
  841. +[%############################################################################%]
  842. +[%# Block for dependencies                                                   #%]
  843. +[%############################################################################%]
  844. +
  845. +[% BLOCK dependencies %]
  846. +  <th align="right">Bug [% bug.bug_id %] [%+ dep.title %]:</th>
  847. +  <td>
  848. +  [% FOREACH depbug = bug.${dep.fieldname} %]
  849. +    [% GetBugLink(depbug, depbug) %][% " " %]
  850. +  [% END %]
  851. +  </td>
  852. +  <td>
  853. +    <input name="[% dep.fieldname %]" 
  854. +           value="[% bug.${dep.fieldname}.join(', ') %]">
  855. +  </td>
  856. +[% END %]
  857. +
  858. +
  859. +[%############################################################################%]
  860. +[%# Block for SELECT fields                                                  #%]
  861. +[%############################################################################%]
  862. +
  863. +[% BLOCK select %]  
  864. +  <td>
  865. +    <select name="[% selname %]">
  866. +      [% FOREACH x = ${selname} %]
  867. +        <option value="[% x FILTER html %]"
  868. +          [% " selected" IF x == bug.${selname} %]>[% x FILTER html %]
  869. +        </option>
  870. +      [% END %]
  871. +    </select>
  872. +  </td>
  873. +  <td>&nbsp;</td>
  874. +[% END %]
# Change User Description Committed
#1 2346 Charles Hardin fixed the bugzilla 2.16.1 patch that was in the p4dti version 1.5.0 tree off of ravenbook......

didn't check the other patches to see if they had the same error «		 22 years ago