summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Green <sgreen@redhat.com>2014-01-21 00:29:22 +0100
committerSimon Green <sgreen@redhat.com>2014-01-21 00:29:22 +0100
commit91ae795be29e4ab48da994e1e33c21b2d3c524b5 (patch)
treea4fbe352c10b0814211f0c1aee79943a100f5598
parente02e3bc792293af9460da9c9d6b9185b94c5307f (diff)
downloadbugzilla-91ae795be29e4ab48da994e1e33c21b2d3c524b5.tar.gz
bugzilla-91ae795be29e4ab48da994e1e33c21b2d3c524b5.tar.xz
Bug 913364 - Reuse preset values when navigation through enter_bug.cgi
r=glob, a=glob
-rwxr-xr-xenter_bug.cgi4
-rw-r--r--template/en/default/global/choose-classification.html.tmpl7
-rw-r--r--template/en/default/global/choose-product.html.tmpl6
3 files changed, 5 insertions, 12 deletions
diff --git a/enter_bug.cgi b/enter_bug.cgi
index 1769b464c..617fdde67 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -75,8 +75,6 @@ if ($product_name eq '') {
$vars->{'classifications'} = [map {$_->{'object'}} @classifications];
$vars->{'target'} = "enter_bug.cgi";
- $vars->{'format'} = $cgi->param('format');
- $vars->{'cloned_bug_id'} = $cgi->param('cloned_bug_id');
print $cgi->header();
$template->process("global/choose-classification.html.tmpl", $vars)
@@ -107,8 +105,6 @@ if ($product_name eq '') {
elsif (scalar(@enterable_products) > 1) {
$vars->{'classifications'} = \@classifications;
$vars->{'target'} = "enter_bug.cgi";
- $vars->{'format'} = $cgi->param('format');
- $vars->{'cloned_bug_id'} = $cgi->param('cloned_bug_id');
print $cgi->header();
$template->process("global/choose-product.html.tmpl", $vars)
diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index 1a59f6d89..815e625a6 100644
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -19,13 +19,13 @@
[% DEFAULT title = "Choose the classification" %]
[% PROCESS global/header.html.tmpl %]
+[% previous_params = cgi.canonicalise_query('classification') %]
<h2>First, you must pick a classification on which to enter [% terms.abug %]:</h2>
<table id="choose_classification">
<tr>
<th class="right">
<a href="[% target FILTER uri %]?classification=__all
- [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%]
- [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
+ [%- IF previous_params %]&amp;[% previous_params FILTER none %][% END -%]">
All</a>:
</th>
@@ -39,8 +39,7 @@
<tr>
<th class="right">
<a href="[% target FILTER uri %]?classification=[% class.name FILTER uri -%]
- [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%]
- [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
+ [%- IF previous_params %]&amp;[% previous_params FILTER none %][% END -%]">
[% class.name FILTER html %]</a>:
</th>
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index b6b75fdbc..5dc619087 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -11,8 +11,6 @@
# classification object and 'products' the list of
# product objects the user can enter bugs into.
# target: the script that displays this template.
- # cloned_bug_id: ID of the bug being cloned.
- # format: the desired format to display the target.
#%]
[% IF target == "enter_bug.cgi" %]
@@ -30,6 +28,7 @@
[% DEFAULT title = "Choose a Product" %]
[% PROCESS global/header.html.tmpl %]
+[% previous_params = cgi.canonicalise_query('classification', 'product') %]
<h2>[% h2 FILTER html %]</h2>
<table id="choose_product">
@@ -46,8 +45,7 @@
<tr>
<th class="right">
<a href="[% target %]?product=[% p.name FILTER uri -%]
- [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%]
- [%- IF format %]&amp;format=[% format FILTER uri %][% END %]">
+ [%- IF previous_params %]&amp;[% previous_params FILTER none %][% END -%]">
[% p.name FILTER html FILTER no_break %]</a>:&nbsp;
</th>