From de0443553cc3b55be7ccfa3c2325c502bf1dd69f Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Sun, 24 Feb 2002 16:24:57 +0000 Subject: Bug 110711 - various query.cgi/tmpl problems. This patch resolves all known issues. --- defparams.pl | 2 +- template/default/query/query.atml | 258 +++++++++++++++++++++----------------- 2 files changed, 144 insertions(+), 116 deletions(-) diff --git a/defparams.pl b/defparams.pl index 871a30e3a..0ba0189d0 100644 --- a/defparams.pl +++ b/defparams.pl @@ -468,7 +468,7 @@ You will get this message once a day until you've dealt with these bugs! DefParam("defaultquery", "This is the default query that initially comes up when you submit a bug. It's in URL parameter format, which makes it hard to read. Sorry!", "t", - "bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=%22Importance%22"); + "bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailqa_contact2=1&order=%22Importance%22"); DefParam("letsubmitterchoosepriority", diff --git a/template/default/query/query.atml b/template/default/query/query.atml index 0d60973bc..190eb095a 100644 --- a/template/default/query/query.atml +++ b/template/default/query/query.atml @@ -347,117 +347,110 @@ function selectProduct(f) { - + - [%# *** Product Component Version Target *** %] - - + [%# *** Comment URL Whiteboard Keywords *** %] - - - + [% IF have_keywords %] + + + + + + [% END %]
- - - - - - - [% IF (Param("usetargetmilestone")) %] - - [% END %] - - - - - [%# Can't use the select block here because of onChange and the fact that - 'component' is a toolkit reserved word - we use 'component_' instead. %] - - - - - [% PROCESS select sel = { name => 'version', size => 5 } %] - - [% IF target_milestone.size > 0 %] - [% PROCESS select sel = { name => 'target_milestone', size => 5 } %] - [% END %] - -
Product:Component:Version:Target:
- - - -
- 		+ + + + + + + [% IF (Param("usetargetmilestone")) %] + + [% END %] + + + + + [%# Can't use the select block here because of onChange and the fact that + 'component' is a toolkit reserved word - we use 'component_' instead. %] + + + + + [% PROCESS select sel = { name => 'version', size => 5 } %] + + [% IF target_milestone.size > 0 %] + [% PROCESS select sel = { name => 'target_milestone', size => 5 } %] + [% END %] + +
Product:Component:Version:Target:
+ + + +
+
- - [% FOREACH field = [ - { name => "long_desc", description => "A comment" }, - { name => "bug_file_loc", description => "The URL" }, - { name => "status_whiteboard", description => "Whiteboard" } ] %] - - [% UNLESS field.name == 'status_whiteboard' AND NOT Param('usestatuswhiteboard') %] - - - - - - [% END %] - [% END %] + [% FOREACH field = [ + { name => "long_desc", description => "A comment" }, + { name => "bug_file_loc", description => "The URL" }, + { name => "status_whiteboard", description => "Whiteboard" } ] %] - [% IF have_keywords %] - - - - - + [% UNLESS field.name == 'status_whiteboard' AND NOT Param('usestatuswhiteboard') %] + + + + + + [% END %] + [% END %] -
[% field.description %]: - -
Keywords: - - - -
[% field.description %]: + + +
-
Keywords: + + + +
@@ -498,6 +491,7 @@ function selectProduct(f) { + [% FOREACH n = [1, 2] %] @@ -511,33 +505,63 @@ function selectProduct(f) { - + - + [% IF Param('useqacontact') %] - + [% END %] - + - +
bug owner + + +
reporter + + +
QA Contact + + +
CC list member + + +
commenter + + +
+ @@ -596,6 +621,7 @@ function selectProduct(f) {
Bug Changes +
Only bugs changed in the last
days
@@ -617,7 +643,7 @@ function selectProduct(f) {
and -
(YYYY-MM-DD) +
(YYYY-MM-DD)
to this value: (optional)
@@ -625,6 +651,7 @@ function selectProduct(f) {
+
@@ -637,9 +664,9 @@ function selectProduct(f) { [% IF NOT userid %] [% ELSE %] -
+
Run this query -
+
[% IF namedqueries.size > 0 %]

@@ -675,15 +702,16 @@ function selectProduct(f) { Remember this as my default query -
+
Remember this query, and name it: -
      +
      and put it in my page footer -
+
[% END %] -

+
+

Sort results by: - + [% IF userdefaultquery %]

Set my default query back to the system default

[% END %] -

+
-- cgit v1.2.3-24-g4f1b