aboutsummaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2006-02-22 06:25:51 +0000
committerjocuri%softhome.net <>2006-02-22 06:25:51 +0000
commitbf1e1f7c24389c140a8768cf3d243e6ffbdd2f8a (patch)
treedb0175f13e0b51727d3e4546d7d3696926b89718 /template/en/default
parent631d910c3dbce389638550c66ab2e6d847703687 (diff)
downloadbugs-bf1e1f7c24389c140a8768cf3d243e6ffbdd2f8a.tar
bugs-bf1e1f7c24389c140a8768cf3d243e6ffbdd2f8a.tar.gz
bugs-bf1e1f7c24389c140a8768cf3d243e6ffbdd2f8a.tar.bz2
bugs-bf1e1f7c24389c140a8768cf3d243e6ffbdd2f8a.tar.xz
bugs-bf1e1f7c24389c140a8768cf3d243e6ffbdd2f8a.zip
Patch for bug 237683: Allow for more flexible user searching such as real name, email, and userid, in editusers; patch by David Lawrence <dkl@redhat.com>, r=bugzilla@chimpychompy.org, a=justdave@bugzilla.org.
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/users/search.html.tmpl9
-rw-r--r--template/en/default/global/user-error.html.tmpl4
2 files changed, 12 insertions, 1 deletions
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 4cb51ca94..68208f756 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -12,6 +12,7 @@
# The Original Code is the Bugzilla Bug Tracking System.
#
# Contributor(s): Marc Schumann <wurblzap@gmail.com>
+ # David Lawrence <dkl@redhat.com>
#%]
[%# INTERFACE:
@@ -35,7 +36,13 @@
<form name="f" method="get" action="editusers.cgi">
<input type="hidden" name="action" value="list" />
-<p><label for="matchstr">List users with login name matching</label>
+<p><label for="matchvalue">List users with</label>
+<select id="matchvalue" name="matchvalue">
+ <option value="login_name">login name</option>
+ <option value="realname">real name</option>
+ <option value="userid">user id</option>
+</select>
+<label for="matchstr">matching</label>
<input size="32" name="matchstr" id="matchstr" />
<select name="matchtype">
<option value="substr" selected="selected">case-insensitive substring</option>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index cd3fd14db..091e4248c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1256,6 +1256,10 @@
[% title = "File Is Empty" %]
The file you are trying to attach is empty!
+ [% ELSIF error == "illegal_user_id" %]
+ [% title = "Illegal User ID" %]
+ User ID '[% userid FILTER html %]' is not valid integer.
+
[% ELSE %]
[%# Try to find hooked error messages %]