From 62097c29203f5e5a5e63168298c3fd1f1b846fb0 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Mon, 25 May 2009 16:59:18 +0000 Subject: Bug 494369: Do not throw an error if the 'order' parameter contains invalid columns for buglists - Patch by Frédéric Buclin r=wicked a=LpSolit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/global/code-error.html.tmpl | 11 ----------- template/en/default/global/messages.html.tmpl | 5 +++++ 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'template/en/default/global') diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index a2863336a..da71da30d 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -190,17 +190,6 @@ The attachment number of one of the attachments you wanted to obsolete, [% attach_id FILTER html %], is invalid. - [% ELSIF error == "invalid_column_name_cookie" %] - [% title = "Invalid Column Name" %] - The custom sort order specified in your cookie contains an invalid - column name [% fragment FILTER html %]. - The cookie has been cleared. - - [% ELSIF error == "invalid_column_name_form" %] - [% title = "Invalid Column Name" %] - The custom sort order specified in your form submission contains an - invalid column name [% fragment FILTER html %]. - [% ELSIF error == "invalid_customfield_type" %] [% title = "Invalid Field Type" %] The type [% type FILTER html %] is not a valid field type. diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index d2915780c..1bc10daa9 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -455,6 +455,11 @@ group. [% END %] + [% ELSIF message_tag == "invalid_column_name" %] + The custom sort order specified contains one or more invalid + column names: [% invalid_fragments.join(', ') FILTER html %]. + They have been removed from the sort list. + [% ELSIF message_tag == "job_queue_depth" %] [% count FILTER html %] jobs in the queue. -- cgit v1.2.3-24-g4f1b