From bb3b21c78c420fb36a27626b80578397c3ac5aff Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 18 Feb 2021 15:25:42 +0000 Subject: [PATCH] Bug 26618: (QA follow-up) Update messages syntax As highlighted, we were not using the standard form of message passing here. This patch updates the template and controller to adopt the more usual syntax. --- C4/RotatingCollections.pm | 10 ++++++++-- .../rotating_collections/transferCollection.tt | 18 ++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm index 6613602ab0..e8e814f455 100644 --- a/C4/RotatingCollections.pm +++ b/C4/RotatingCollections.pm @@ -473,7 +473,8 @@ sub TransferCollection { ); # Queue transfer push @{$messages}, { - type => 'enqueu', + type => 'alert', + code => 'enqueued', item => $item_object, found_transfer => $found_transfer }; @@ -492,7 +493,12 @@ sub TransferCollection { } } elsif ( $_->isa('Koha::Exceptions::Item::Transfer::Limit') ) { - push @{$messages}, { type => 'failure', item => $item_object }; + push @{$messages}, + { + type => 'error', + code => 'limits', + item => $item_object + }; } else { $_->rethrow(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt index 66a5817aec..ba09a34ba0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt @@ -21,16 +21,14 @@ [% IF ( messages ) %] [% FOREACH message IN messages %] - [%- SWITCH message.type -%] - [%- CASE 'failure' %] -
-

Cannot transfer item [% message.item.itemnumber | html %] due to transfer limits

-
- [%- CASE 'enqueu' -%] -
-

Item [% message.item.itemnumber | html %] queued behind [% message.found_transfer.reason | html %] transfer to [% Branches.GetName(message.found_transfer.tobranch) | html %]

-
- [% END %] +
+ [%- SWITCH message.code -%] + [%- CASE 'limits' %] +

Cannot transfer item [% message.item.itemnumber | html %] due to transfer limits

+ [%- CASE 'enqueued' -%] +

Item [% message.item.itemnumber | html %] queued behind [% message.found_transfer.reason | html %] transfer to [% Branches.GetName(message.found_transfer.tobranch) | html %]

+ [% END %] +
[% END %] [% END %] -- 2.20.1