From 254b647360e04dbfd22ce2146d038874e8b40702 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 24 Feb 2017 07:46:19 +0000 Subject: [PATCH] Bug 7663: Fix bad merge conflict with bug 15584 Signed-off-by: Jonathan Druart --- virtualshelves/shelves.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index a6d04ce..c328869 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -151,18 +151,18 @@ if ( $op eq 'add_form' ) { my $biblio = GetBiblioFromItemNumber( $item->{itemnumber} ); my $added = eval { $shelf->add_biblio( $biblio->{biblionumber}, $loggedinuser ); }; if ($@) { - push @messages, { item_barcode => $barcode, type => 'error', code => ref($@), msg => $@ }; + push @messages, { item_barcode => $barcode, type => 'alert', code => ref($@), msg => $@ }; } elsif ( $added ) { push @messages, { item_barcode => $barcode, type => 'message', code => 'success_on_add_biblio' }; } else { push @messages, { item_barcode => $barcode, type => 'message', code => 'error_on_add_biblio' }; } } else { - push @messages, { item_barcode => $barcode, type => 'error', code => 'item_does_not_exist' }; + push @messages, { item_barcode => $barcode, type => 'alert', code => 'item_does_not_exist' }; } } } else { - push @messages, { type => 'error', code => 'unauthorized_on_add_biblio' }; + push @messages, { type => 'alert', code => 'unauthorized_on_add_biblio' }; } } } else { -- 2.1.4