Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 7663: Fix bad merge conflict with bug 15584

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2017-02-24 07:46:19 +00:00 committed by Kyle M Hall
parent c3f6f26c35
commit 3f6f4a2b36
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
virtualshelves/shelves.pl
View file

@ -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 {