summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-07-08 20:23:59 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-07-08 20:23:59 +0200
commitfcccff080fcfb784354f4bf44d863cb4482a469e (patch)
treeee557cd4023acaa487b35897e429b1b3b3868e87 /template
parent0e8eb4037e3931e408aeb98f2ed5760710c961a2 (diff)
downloadbugzilla-fcccff080fcfb784354f4bf44d863cb4482a469e.tar.gz
bugzilla-fcccff080fcfb784354f4bf44d863cb4482a469e.tar.xz
Bug 574556: Refactor Search.pm so that we're not doing $$some_var everywhere.
Instead, we pass around a hashref and update the hashref. This patch also includes some cleanup for bugs surrounding percentage_complete, attachments.isobsolete, attachments.ispatch, and owner_idle_time. r=mkanat, a=mkanat
Diffstat (limited to 'template')
-rw-r--r--template/en/default/global/code-error.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl22
2 files changed, 16 insertions, 10 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 43644f703..849008adb 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -184,10 +184,6 @@
'[% field.description FILTER html %]' ([% field.name FILTER html %])
is not a custom field.
- [% ELSIF error == "field_type_mismatch" %]
- Cannot seem to handle <code>[% field FILTER html %]</code>
- and <code>[% type FILTER html %]</code> together.
-
[% ELSIF error == "field_type_not_specified" %]
[% title = "Field Type Not Specified" %]
You must specify a type when creating a custom field.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 490941807..3f7248c40 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -744,11 +744,15 @@
[% title = "Group not specified" %]
No group was specified.
+ [% ELSIF error == "group_not_visible" %]
+ [% title = "Group Not Allowed" %]
+ You are not allowed to see members of the [% group.name FILTER html %]
+ group.
+
[% ELSIF error == "system_group_not_deletable" %]
[% title = "System Groups not deletable" %]
<em>[% name FILTER html %]</em> is a system group.
This group cannot be deleted.
-
[% ELSIF error == "group_unknown" %]
[% title = "Unknown Group" %]
The group [% name FILTER html %] does not exist. Please specify
@@ -1288,6 +1292,9 @@
[% IF class == "Bugzilla::User" %]
Either you mis-typed the name or that user has not yet registered
for a [% terms.Bugzilla %] account.
+ [% ELSIF class == "Bugzilla::Keyword" %]
+ The legal keyword names are <a href="describekeywords.cgi">listed
+ here</a>.
[% END %]
[% ELSIF error == "old_password_incorrect" %]
@@ -1477,6 +1484,12 @@
and the "matches" search can only be used with the "content"
field.
+ [% ELSIF error == "search_field_operator_invalid" %]
+ [% terms.Bugzilla %] does not support using the
+ "[%+ field_descs.$field FILTER html %]" ([% field FILTER html %])
+ field with the "[% search_descs.$operator %]" ([% operator FILTER html %])
+ search type.
+
[% ELSIF error == "series_already_exists" %]
[% title = "Series Already Exists" %]
[% docslinks = {'reporting.html' => 'Reporting'} %]
@@ -1562,11 +1575,6 @@
I could not figure out what you wanted to do.
[% END %]
- [% ELSIF error == "unknown_keyword" %]
- [% title = "Unknown Keyword" %]
- <code>[% keyword FILTER html %]</code> is not a known keyword.
- The legal keyword names are <a href="describekeywords.cgi">listed here</a>.
-
[% ELSIF error == "unknown_tab" %]
[% title = "Unknown Tab" %]
<code>[% current_tab_name FILTER html %]</code> is not a legal tab name.
@@ -1759,6 +1767,8 @@
field
[% ELSIF class == "Bugzilla::Group" %]
group
+ [% ELSIF class == "Bugzilla::Keyword" %]
+ keyword
[% ELSIF class == "Bugzilla::Product" %]
product
[% ELSIF class == "Bugzilla::Search::Recent" %]