From 09dd4d3192073ba9ecc7feb8a5dfcd213affd525 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Mon, 24 Sep 2018 17:27:12 -0400 Subject: Bug 1493500 - Remove all trailing whitespaces from all files --- template/en/default/global/code-error.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'template/en/default/global/code-error.html.tmpl') diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index b37e7ca7b..23d7c203b 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -315,7 +315,7 @@ [% ELSIF error == "jobqueue_status_error" %] An error occurred while checking the job queue status. Try again at a - later time. + later time. [% ELSIF error == "ldap_bind_failed" %] Failed to bind to the LDAP server. The error message was: -- cgit v1.2.3-24-g4f1b From 62412db14081dd66cd5b2701b598b5af9eb31528 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Tue, 2 Oct 2018 14:22:05 -0400 Subject: add helpers for handling logins and error handling --- template/en/default/global/code-error.html.tmpl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'template/en/default/global/code-error.html.tmpl') diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 23d7c203b..8aaf10127 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -514,13 +514,15 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] -[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] - [% error_message FILTER none %] - [% ELSE %] - [% error_message FILTER txt %] +[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %] + [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] + [% RETURN %] [% END %] - [% RETURN %] [% END %] [% UNLESS header_done %] -- cgit v1.2.3-24-g4f1b