@@ -, +, @@ --- .../en/modules/rotating_collections/addItems.tt | 52 +++++------- .../rotating_collections/editCollections.tt | 93 ++++++++-------------- rotating_collections/editCollections.pl | 28 +++---- 3 files changed, 63 insertions(+), 110 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -24,44 +24,28 @@ [% INCLUDE 'rotating-collections-toolbar.inc' %]
Failed to add item with barcode [% barcode %]: -
- [% IF failureMessage == "NO_ITEM" %] - No item with matching barcode found - [% ELSIF failureMessage == "IN_COLLECTION_OTHER" %] - Item is already in a different rotating collection - [% ELSIF failureMessage == "IN_COLLECTION" %] - Item is already in this collection - [% ELSE %] - [% failureMessage %] - [% END %] -
+ [% IF ( messages ) %] + - [% END %] [% END %] - [% IF ( previousActionRemove ) %] - [% IF ( removeSuccess ) %] - - [% ELSE %] -- [% IF failureMessage == "NO_ITEM" %] - No item with matching barcode found - [% ELSIF failureMessage == "NOT_IN_COLLECTION" %] - Item is not in this collection - [% ELSE %] - [% failureMessage %] - [% END %] -
+ [% IF ( errors ) %] +Collection [% createdTitle %] failed to be added
-- [% IF failureMessage == "NO_TITLE" %] - No title entered. - [% ELSIF failureMessage == "DUPLICATE_TITLE" %] - Title already in use. - [% ELSIF failureMessage == "NO_DESCRIPTION" %] - No description entered. - [% ELSE %] - [% failureMessage %] - [% END %] -
-Collection [% updatedTitle %] failed to be updated
-- [% IF failureMessage == "NO_ID" %] - No collection id given. - [% ELSIF failureMessage == "DUPLICATE_TITLE" %] - Title already in use. - [% ELSE %] - [% failureMessage %] - [% END %] -
+ [% IF errors %] +Collection [% createdTitle %] failed to be added
+ [% ELSIF error.code == "error_on_delete" %] +Collection failed to be deleted
+ [% ELSIF error.code == "error_on_updated" %] +Collection [% updatedTitle %] failed to be updated
+ [% END %] + [% END %] +