From 8f8766ab97ba1e4f55c0254e65131b5585c19a2e Mon Sep 17 00:00:00 2001 From: "myk%mozilla.org" <> Date: Fri, 8 Nov 2002 09:35:36 +0000 Subject: Fix for bug 172518: makes the request tracker use the generic user matching code r=not_erik,joel a=justdave --- .../en/default/global/confirm-user-match.html.tmpl | 15 ++- template/en/default/request/verify.html.tmpl | 108 --------------------- 2 files changed, 10 insertions(+), 113 deletions(-) delete mode 100644 template/en/default/request/verify.html.tmpl (limited to 'template/en/default') 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 @@ Please go back and try again with a more specific name/address. - [% ELSIF query.value.selecttype == 'single' %] + [% ELSIF fields.${field.key}.type == 'single' %] matched:
- for [% flag.type.name FILTER html %] - -

- - [% ELSIF flag.requestees.size == 1 %] - - - - [% ELSE %] -

- More than one user's name or email address contains the string - [% flag.requestee_str FILTER html %]. Choose the user - you meant from the following menu or click the back button and try - again with a more specific string. -

-

- Ask - for [% flag.type.name %] - -

- - [% END %] -[% END %] - - - - - -[% PROCESS global/footer.html.tmpl %] - -- cgit v1.2.1