Bug 7663: Fix bad merge conflict with bug 15584
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 24 Feb 2017 07:46:19 +0000 (07:46 +0000)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 3 Mar 2017 18:18:14 +0000 (18:18 +0000)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
virtualshelves/shelves.pl

index a6d04ce..c328869 100755 (executable)
@@ -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 {