From ded9ecbc3c672be12253e3a9e97c67ce40913237 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 25 Mar 2013 12:22:33 -0400 Subject: [PATCH] Bug 9924 - Simplify and rename patron card creator error message include Content-Type: text/plain; charset="utf-8" The patron card creator error message include uses a non-standard method for displaying error messages, and is poorly-named. This patch converts the method of displaying error messages for various patron card creator options to the standard one ('
') and renames the include file to make it clear that it relates only to patron card creator operations. To test, perform various operations: - Go to 'manage images' and try to upload a file which exceeds the 500KBfile size limit - Go to the edit batch page and manually append an error code to the URL: /cgi-bin/koha/patroncards/edit-batch.pl?op=new&error=403 - Go to one of the manage pages and manually append an error code to the URL: /cgi-bin/koha/patroncards/manage.pl?card_element=profile&error=201 Correct display of an error message indicates that the include file is being found. --- .../prog/en/includes/error-messages.inc | 108 -------------------- .../prog/en/includes/patroncards-errors.inc | 36 +++++++ .../prog/en/modules/patroncards/edit-batch.tt | 2 +- .../prog/en/modules/patroncards/image-manage.tt | 2 +- .../prog/en/modules/patroncards/manage.tt | 2 +- 5 files changed, 39 insertions(+), 111 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc deleted file mode 100644 index fe71f26..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc +++ /dev/null @@ -1,108 +0,0 @@ -[% IF ( error ) %] - - -[% END %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc new file mode 100644 index 0000000..f71edcc --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc @@ -0,0 +1,36 @@ +[% IF ( error ) %] +
+

+ WARNING: + [% IF ( 101 ) %] + The database returned an error while [% IF ( card_element ) %]saving [% card_element %] [% element_id %][% ELSE %]attempting a save operation[% END %]. Please have your system administrator check the error log for details. + [% ELSIF ( 102 ) %] + The database returned an error while [% IF ( card_element ) %]deleting [% card_element %] [% element_id %][% ELSIF ( image_ids ) %][% image_ids %][% ELSE %]attempting a delete operation[% END %]. Please have your system administrator check the error log for details. + [% ELSIF ( 201 ) %] + An unsupported operation was attempted[% IF ( element_id ) %] on [% card_element %] [% element_id %][% END %]. Please have your system administrator check the error log for details. + [% ELSIF ( 202 ) %] + An error has occurred. Please ask your system administrator to check the error log for more details. + [% ELSIF ( 203 ) %] + A non-existent or invalid library code was supplied. Please verify that you have a library selected. + [% ELSIF ( 301 ) %] + An error has occurred while attempting to upload the image file. Please ask you system administrator to check the error log for more details. + [% ELSIF ( 302 ) %] + Image exceeds 500KB. Please resize and import again. + [% ELSIF ( 303 ) %] + The database image quota currently only allows a maximum of [% image_limit %] images to be stored at any one time. Please delete one or more images to free up quota space. + [% ELSIF ( 401 ) %] + An error has occurred and the item(s) was not added to batch [% batch_id %]. Please have your system administrator check the error log for details. + [% ELSIF ( 402 ) %] + The item(s) was not added because the library is not set. Please set your library before adding items to a batch. + [% ELSIF ( 403 ) %] + An error has occurred and the item(s) was not removed from batch [% batch_id %]. Please have your system administrator check the error log for details. + [% ELSIF ( 404 ) %] + An error has occurred and batch [% batch_id %] was not deleted. Please have your system administrator check the error log for details. + [% ELSIF ( 405 ) %] + An error has occurred and batch [% batch_id %] not fully de-duplicated. + [% ELSE %] + [% END %] +

+
+[% END %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index 7a0811b..d5204a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -18,7 +18,7 @@
[% INCLUDE 'patroncards-batches-toolbar.inc' %] - [% INCLUDE 'error-messages.inc' %] + [% INCLUDE 'patroncards-errors.inc' %]
Current library: [% LoginBranchname %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt index 66f1725..9c8f944 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt @@ -56,7 +56,7 @@
- [% INCLUDE 'error-messages.inc' %] + [% INCLUDE 'patroncards-errors.inc' %]

Upload Images

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index 0f85229..a0ac1f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -108,7 +108,7 @@
[% INCLUDE 'patroncards-toolbar.inc' %] - [% INCLUDE 'error-messages.inc' %] + [% INCLUDE 'patroncards-errors.inc' %]
Current library: [% LoginBranchname %]
-- 1.7.9.5