diff options
| -rw-r--r-- | Bugzilla/Config/UserMatch.pm | 6 | ||||
| -rw-r--r-- | docs/en/xml/administration.xml | 7 | ||||
| -rw-r--r-- | template/en/default/admin/params/usermatch.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/userselect.html.tmpl | 4 |
7 files changed, 23 insertions, 9 deletions
diff --git a/Bugzilla/Config/UserMatch.pm b/Bugzilla/Config/UserMatch.pm index f97cfeab2..38d2cb05b 100644 --- a/Bugzilla/Config/UserMatch.pm +++ b/Bugzilla/Config/UserMatch.pm @@ -47,6 +47,12 @@ sub get_param_list { }, { + name => 'ajax_user_autocompletion', + type => 'b', + default => '1', + }, + + { name => 'maxusermatches', type => 't', default => '1000', diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml index c50ccbb3b..4b7189755 100644 --- a/docs/en/xml/administration.xml +++ b/docs/en/xml/administration.xml @@ -862,7 +862,12 @@ contains parameters for how user names can be queried and matched when entered. </para> - + <para> + Another setting called 'ajax_user_autocompletion' enables certain + user fields to display a list of matched user names as a drop down after typing + a few characters. Note that it is recommended to use mod_perl when + enabling 'ajax_user_autocompletion'. + </para> </section> </section> diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl index 54f150900..d574edca7 100644 --- a/template/en/default/admin/params/usermatch.html.tmpl +++ b/template/en/default/admin/params/usermatch.html.tmpl @@ -29,6 +29,9 @@ "needs to be selected. This option should not be enabled on " _ "sites where there are a large number of users.", + ajax_user_autocompletion => "If this option is set, typing characters in a certain user " _ + "fields will display a list of matches that can be selected from.", + maxusermatches => "Search for no more than this many matches.<br> " _ "If set to '1', no users will be displayed on ambiguous matches. " _ "This is useful for user privacy purposes.<br> " _ diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index a7962fcf4..70a345984 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -126,7 +126,7 @@ [% ELSIF error == "db_rename_conflict" %] Name conflict: Cannot rename [% old FILTER html %] to - [% new FILTER html %] because [% new FILTER html %] already exists. + [%+ new FILTER html %] because [% new FILTER html %] already exists. [% ELSIF error == "cookies_need_value" %] Every cookie must have a value. @@ -206,7 +206,7 @@ [% ELSIF error == "invalid_attach_id_to_obsolete" %] The attachment number of one of the attachments you wanted to obsolete, - [% attach_id FILTER html %], is invalid. + [%+ attach_id FILTER html %], is invalid. [% ELSIF error == "invalid_customfield_type" %] [% title = "Invalid Field Type" %] @@ -248,7 +248,7 @@ Attachment [% attach_id FILTER html %] ([% description FILTER html %]) is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %], but you tried to flag it as obsolete while creating a new attachment to - [% terms.bug %] [%+ my_bug_id FILTER html %]. + [%+ terms.bug %] [%+ my_bug_id FILTER html %]. [% ELSIF error == "feature_disabled" %] The [% install_string("feature_$feature") FILTER html %] feature is not @@ -335,7 +335,7 @@ [% ELSIF error == "mail_send_error" %] There was an error sending mail from '[% mail.header('From') FILTER html %]' to '[% mail.header('To') FILTER html %]': - [% msg FILTER html %] + [%+ msg FILTER html %] [% ELSIF error == "missing_bug_id" %] No [% terms.bug %] ID was given. diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 01eb32651..6e24198dd 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -712,7 +712,7 @@ [% ELSIF message_tag == "install_fk_invalid" %] ERROR: There are invalid values for the [% column FILTER html %] column in the [% table FILTER html %] table. (These values do not exist in the [% foreign_table FILTER html %] table, in the - [% foreign_column FILTER html %] column.) + [%+ foreign_column FILTER html %] column.) Before continuing with checksetup, you will need to fix these values, either by deleting these rows from the database, or changing the values diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 636e26500..295f7328f 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -588,7 +588,7 @@ [% ELSIF error == "fieldvalue_still_has_bugs" %] [% title = "You Cannot Delete This Field Value" %] You cannot delete the value '[% value.name FILTER html %]' from the - [% field.description FILTER html %] field, because there are still + [%+ field.description FILTER html %] field, because there are still [%+ value.bug_count FILTER html %] [%+ terms.bugs %] using it. [% ELSIF error == "fieldvalue_undefined" %] diff --git a/template/en/default/global/userselect.html.tmpl b/template/en/default/global/userselect.html.tmpl index 600b21c13..1d0395043 100644 --- a/template/en/default/global/userselect.html.tmpl +++ b/template/en/default/global/userselect.html.tmpl @@ -79,7 +79,7 @@ [% END %] </select> [% ELSE %] - [% IF id && feature_enabled('jsonrpc') %] + [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') && id %] <div id="[% id FILTER html %]_autocomplete" [% IF classes %] class="[% classes.join(' ') FILTER html %]" [% END %]> [% END %] @@ -94,7 +94,7 @@ [% IF size %] size="[% size FILTER html %]" [% END %] [% IF id %] id="[% id FILTER html %]" [% END %] > - [% IF id && feature_enabled('jsonrpc') %] + [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') && id %] <div id="[% id FILTER html %]_autocomplete_container"></div> </div> <script type="text/javascript"> |