summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authormyk%mozilla.org <>2002-11-08 10:35:36 +0100
committermyk%mozilla.org <>2002-11-08 10:35:36 +0100
commit8f8766ab97ba1e4f55c0254e65131b5585c19a2e (patch)
tree285bf5a43424996e491779c9ac6d9004717ee4c3 /template/en/default
parent34c5c3b6bed3d8640d8671844e0cf0c0830c9afc (diff)
downloadbugzilla-8f8766ab97ba1e4f55c0254e65131b5585c19a2e.tar.gz
bugzilla-8f8766ab97ba1e4f55c0254e65131b5585c19a2e.tar.xz
Fix for bug 172518: makes the request tracker use the generic user matching code
r=not_erik,joel a=justdave
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/global/confirm-user-match.html.tmpl15
-rw-r--r--template/en/default/request/verify.html.tmpl108
2 files changed, 10 insertions, 113 deletions
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 2c1d0d2bd..4a12f44a9 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -23,13 +23,15 @@
[%# INTERFACE:
# form: hash; the form values submitted to the script
# mform: hash; the form multi-values submitted to the script
+ # fields: hash/record; the fields being matched, each of which has:
+ # type: single|multi: whether or not the user can select multiple matches
+ # flag_type: for flag requestee fields, the type of flag being requested
# matches: hash; Hierarchical. The levels go like this:
# field_name {
# pattern_text {
- # 'users' = @user_list (user objects)
- # 'selecttype' = single|multi (selectbox type)
- # 'status' = success|fail|trunc (result of search.
- # 'trunc' (truncated) means max was reached)
+ # 'users' = @user_list (user objects)
+ # 'status' = success|fail|trunc (result of search.
+ # 'trunc' (truncated) means max was reached)
# }
# }
# script: string; The name of the calling script, used to create a
@@ -90,7 +92,7 @@
</font>
Please go back and try again with a more specific
name/address.
- [% ELSIF query.value.selecttype == 'single' %]
+ [% ELSIF fields.${field.key}.type == 'single' %]
matched:<br>
<select name="[% field.key FILTER html %]"
id="[% field.key FILTER html %]">
@@ -173,6 +175,9 @@
[%- # ELSIF for things that don't belong in the field_descs hash here -%]
+ [% ELSIF field_name.match("^requestee") %]
+ [% fields.${field_name}.flag_type.name %] requestee
+
[% ELSE %]
[% field_name FILTER html %]
[% END %]
diff --git a/template/en/default/request/verify.html.tmpl b/template/en/default/request/verify.html.tmpl
deleted file mode 100644
index ad4c07d2c..000000000
--- a/template/en/default/request/verify.html.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- 1.0@bugzilla.org -->
-[%# The contents of this file are subject to the Mozilla Public
- # License Version 1.1 (the "License"); you may not use this file
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.mozilla.org/MPL/
- #
- # Software distributed under the License is distributed on an "AS
- # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # rights and limitations under the License.
- #
- # The Original Code is the Bugzilla Bug Tracking System.
- #
- # The Initial Developer of the Original Code is Netscape Communications
- # Corporation. Portions created by Netscape are
- # Copyright (C) 1998 Netscape Communications Corporation. All
- # Rights Reserved.
- #
- # Contributor(s): Myk Melez <myk@mozilla.org>
- #%]
-
-[%# INTERFACE:
- # form, mform: hashes; the form values submitted to the script, used by
- # hidden-fields to generate hidden form fields replicating
- # the original form
- # flags: array; the flags the user made, including information about
- # potential requestees for those flags (based on
- # the string the user typed into the requestee fields)
- # target: record; the bug/attachment for which the flags are being made
- #%]
-
-[% UNLESS header_done %]
- [% title = BLOCK %]
- Verify Requests for Bug #[% target.bug.id %]
- [% IF target.attachment %], Attachment #[% target.attachment.id %][% END %]
- [% END %]
-
- [% h1 = BLOCK %]
- Verify Requests for <a href="show_bug.cgi?id=[% target.bug.id %]">Bug #[% target.bug.id %]</a>
- [% IF target.attachment.exists %],
- <a href="attachment.cgi?id=[% target.attachment.id %]&action=edit">Attachment #[% target.attachment.id %]</a>
- [% END %]
- [% END %]
-
- [% h2 = BLOCK %]
- [% target.bug.summary FILTER html %]
- [% IF target.attachment.exists %]
- : [% target.attachment.summary FILTER html %]
- [% END %]
- [% END %]
-
- [% PROCESS global/header.html.tmpl %]
-[% END %]
-
-<form method="post">
-
-[% PROCESS "global/hidden-fields.html.tmpl"
- exclude=("^(flag_type|requestee)-") %]
-
-[% FOREACH flag = flags %]
- [% IF flag.requestees.size == 0 %]
- <p>
- Sorry, I can't find a user whose name or email address contains
- the string <em>[% flag.requestee_str FILTER html %]</em>.
- Double-check that the user's name or email address contains that
- string, or try entering a shorter string.
- </p>
- <p>
- Ask <input type="text" size="20" maxlength="255"
- name="requestee-[% flag.type.id %]"
- value="[% flag.requestee_str FILTER html %]">
- for [% flag.type.name FILTER html %]
- <input type="hidden" name="flag_type-[% flag.type.id %]" value="?">
- </p>
-
- [% ELSIF flag.requestees.size == 1 %]
- <input type="hidden"
- name="requestee-[% flag.type.id %]"
- value="[% flag.requestee.email FILTER html %]">
- <input type="hidden" name="flag_type-[% flag.type.id %]" value="?">
-
- [% ELSE %]
- <p>
- More than one user's name or email address contains the string
- <em>[% flag.requestee_str FILTER html %]</em>. Choose the user
- you meant from the following menu or click the back button and try
- again with a more specific string.
- </p>
- <p>
- Ask <select name="requestee-[% flag.type.id %]">
- [% FOREACH requestee = flag.requestees %]
- <option value="[% requestee.email FILTER html %]">
- [% requestee.identity FILTER html%]</option>
- [% END %]
- </select>
- for [% flag.type.name %]
- <input type="hidden" name="flag_type-[% flag.type.id %]" value="?">
- </p>
-
- [% END %]
-[% END %]
-
-<input type="submit" value="Commit">
-
-</form>
-
-[% PROCESS global/footer.html.tmpl %]
-