Skip to content

bugzilla
bugzilla
Commit 2fbdc1d8 authored by gerv%gerv.net's avatar gerv%gerv.net
Browse files
Options

Bug 138284 - prepare for Bugzilla Helper replacement enter_bug template. Patch…

Bug 138284 - prepare for Bugzilla Helper replacement enter_bug template. Patch by gerv; r=bbaetz, myk.
parent 48fcdfb5
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 9 deletions
enter_bug.cgi
View file @ 2fbdc1d8
......@@ -86,6 +86,7 @@ if (!defined $::FORM{'product'}) {
$vars->{'proddesc'} = \%products;
$vars->{'target'} = "enter_bug.cgi";
$vars->{'format'} = $::FORM{'format'};
$vars->{'title'} = "Enter Bug";
$vars->{'h2'} =
"First, you must pick a product on which to enter a bug.";
......@@ -258,9 +259,23 @@ elsif (1 == @{$::components{$product}}) {
$::FORM{'component'} = $::components{$product}->[0];
}
my @components;
SendSQL("SELECT value, description FROM components " .
"WHERE program = " . SqlQuote($product) . " ORDER BY value");
while (MoreSQLData()) {
my ($name, $description) = FetchSQLData();
my %component;
$component{'name'} = $name;
$component{'description'} = $description;
push @components, \%component;
}
my %default;
$vars->{'component_'} = $::components{$product};
$vars->{'component_'} = \@components;
$default{'component_'} = formvalue('component');
$vars->{'assigned_to'} = formvalue('assigned_to');
......@@ -359,7 +374,8 @@ if ($::usergroupset ne '0') {
$vars->{'default'} = \%default;
print "Content-type: text/html\n\n";
$template->process("bug/create/create.html.tmpl", $vars)
my $format = ValidateOutputFormat($::FORM{'format'}, "create");
print "Content-type: $format->{'contenttype'}\n\n";
$template->process("bug/create/$format->{'template'}", $vars)
|| ThrowTemplateError($template->error());
exit;
globals.pl
View file @ 2fbdc1d8
......@@ -1750,6 +1750,9 @@ $::vars =
# SyncAnyPendingShadowChanges - called in the footer to sync the shadowdb
'SyncAnyPendingShadowChanges' => \&SyncAnyPendingShadowChanges ,
# User Agent - useful for detecting in templates
'user_agent' => $ENV{'HTTP_USER_AGENT'} ,
};
1;
template/en/default/bug/create/create.html.tmpl
View file @ 2fbdc1d8
......@@ -78,8 +78,9 @@
<td>
<select name="component" size="5">
[%- FOREACH c = component_ %]
<option value="[% c FILTER html %]"
[% " selected=\"selected\"" IF c == default.component_ %]>[% c FILTER html -%]
<option value="[% c.name FILTER html %]"
[% " selected=\"selected\"" IF c.name == default.component_ %]>
[% c.name FILTER html -%]
</option>
[%- END %]
</select>
......
template/en/default/global/choose-product.html.tmpl
View file @ 2fbdc1d8
......@@ -27,8 +27,9 @@
[% FOREACH p = proddesc.keys.sort %]
<tr>
<th align="right" valign="top">
<a href="[% target %]?product=[% p FILTER url_quote %]">
[% p FILTER html %]</a>:
<a href="[% target %]?product=[% p FILTER url_quote %]
[%- "&amp;format=$format" IF format %]">
[% p FILTER html %]</a>:
</th>
[% IF proddesc.$p %]
......
template/en/default/list/list-simple.html.tmpl
View file @ 2fbdc1d8
......@@ -39,7 +39,11 @@
</head>
<body>
[% PROCESS list/table.html.tmpl %]
[% IF bugs.size == 0 %]
<h3>Zarro Boogs found.</h3>
[% ELSE %]
[% PROCESS list/table.html.tmpl %]
[% END %]
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment