From a0dd2595f26d03b696d33fdd0b62e17e53ca379c Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen
Date: Thu, 2 Mar 2017 14:31:27 +0100
Subject: [PATCH] Bug 7317: Make error messages slightly more user friendly.
* koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt: Change
layout of errors, don't display cancel heading on cancel error.
---
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 201a9776b1..7ecbfd15b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -182,10 +182,9 @@
Error performing operation
We encountered an error:
-
- - [% whole.status %]
- - [% whole.message %]
-
+
+
[% whole.message %] ([% whole.status %])
+
[% END %]
[% IF query_type == 'create' %]
@@ -196,8 +195,8 @@
Confirm ILL request
[% PROCESS $whole.template %]
- [% ELSIF query_type == 'cancel' %]
- Cancel an confirmed request
+ [% ELSIF query_type == 'cancel' and !whole.error %]
+ Cancel a confirmed request
[% PROCESS $whole.template %]
[% ELSIF query_type == 'generic_confirm' %]
--
2.11.0