From 86be28be9791fbe6a76db642e754732ea8f0fd78 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 26 Mar 2019 14:11:28 +0000 Subject: [PATCH] Bug 22575: Item type administration uses invalid error class for dialog This patch modifies the item types administration script so that it passes a valid message type to the template, where the type is used as a CSS class. "Error" is a nonexistent dialog class. It should be "alert." To test, apply the patch and go to Administration -> Item types. - Try to delete an item type which is in use. The style of the error dialog should be correct. - Try to add an item type using a code which already exists. The error should look correct. Signed-off-by: Pierre-Marc Thibault --- admin/itemtypes.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl index 441bd05..48ddbfa 100755 --- a/admin/itemtypes.pl +++ b/admin/itemtypes.pl @@ -110,7 +110,7 @@ if ( $op eq 'add_form' ) { eval { $itemtype->store; }; if ($@) { - push @messages, { type => 'error', code => 'error_on_update' }; + push @messages, { type => 'alert', code => 'error_on_update' }; } else { push @messages, { type => 'message', code => 'success_on_update' }; } @@ -137,13 +137,13 @@ if ( $op eq 'add_form' ) { eval { $itemtype->store; }; if ($@) { - push @messages, { type => 'error', code => 'error_on_insert' }; + push @messages, { type => 'alert', code => 'error_on_insert' }; } else { push @messages, { type => 'message', code => 'success_on_insert' }; } } else { push @messages, - { type => 'error', + { type => 'alert', code => 'already_exists', }; } @@ -155,7 +155,7 @@ if ( $op eq 'add_form' ) { my $itemtype = Koha::ItemTypes->find($itemtype_code); my $can_be_deleted = $itemtype->can_be_deleted(); if ($can_be_deleted == 0) { - push @messages, { type => 'error', code => 'cannot_be_deleted'}; + push @messages, { type => 'alert', code => 'cannot_be_deleted'}; $op = 'list'; } else { $template->param( itemtype => $itemtype, ); @@ -166,7 +166,7 @@ if ( $op eq 'add_form' ) { my $itemtype = Koha::ItemTypes->find($itemtype_code); my $deleted = eval { $itemtype->delete }; if ( $@ or not $deleted ) { - push @messages, { type => 'error', code => 'error_on_delete' }; + push @messages, { type => 'alert', code => 'error_on_delete' }; } else { push @messages, { type => 'message', code => 'success_on_delete' }; } -- 2.7.4