Bug 7295: (follow-up) update DBIx::Class schema classes

[koha.git] / serials / serials-edit.pl

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index fbf9ad5..8fb2e60 100755 (executable)
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -72,6 +72,7 @@ use C4::Koha;
 use C4::Output;
 use C4::Context;
 use C4::Serials;
+use C4::Search qw/enabled_staff_search_views/;
 use List::MoreUtils qw/uniq/;
 
 my $query           = CGI->new();
@@ -115,7 +116,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => 'intranet',
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'receive_serials' },
         debug           => 1,
     }
 );
@@ -133,6 +134,7 @@ foreach my $serialid (@serialids) {
         && !$processedserialid{$serialid} )
     {
         my $serinfo = GetSerialInformation($serialid); #TODO duplicates work done by GetSerials2 above
+
         for my $d ( qw( publisheddate planneddate )){
             if ( $serinfo->{$d} =~m/^00/ ) {
                 $serinfo->{$d} = q{};
@@ -150,6 +152,7 @@ foreach my $serialid (@serialids) {
             )
             || $serinfo->{'cannotedit'}
         );
+        $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
         push @serialdatalist, $serinfo;
         $processedserialid{$serialid} = 1;
     }
@@ -176,6 +179,7 @@ foreach my $subscriptionid (@subscriptionids) {
             $cell->{serialsadditems} = 1;
         }
         $cell->{'subscriptionid'} = $subscriptionid;
+        $cell->{biblionumber} = $serialdatalist[0]->{'biblionumber'};
         $cell->{'itemid'}         = 'NNEW';
         $cell->{'serialid'}       = 'NEW';
         $cell->{'issuesatonce'}   = 1;
@@ -196,6 +200,11 @@ $template->param( subscriptions => \@subscriptionloop );
 
 if ( $op and $op eq 'serialchangestatus' ) {
 
+    # Convert serialseqs to UTF-8 to prevent encoding problems
+    foreach my $seq (@serialseqs) {
+        utf8::decode($seq) unless utf8::is_utf8($seq);
+    }
+
     my $newserial;
     for ( my $i = 0 ; $i <= $#serialids ; $i++ ) {
         my ($plan_date, $pub_date);
@@ -310,8 +319,12 @@ if ( $op and $op eq 'serialchangestatus' ) {
                     if ( C4::Context->preference('autoBarcode') eq
                         'incremental' )
                     {
-                        if ( !$bib_record->field($barcodetagfield)
-                            ->subfield($barcodetagsubfield) )
+                        if (
+                            !(
+                                   $bib_record->field($barcodetagfield)
+                                && $bib_record->field($barcodetagfield)->subfield($barcodetagsubfield)
+                            )
+                          )
                         {
                             my $sth_barcode = $dbh->prepare(
                                 'select max(abs(barcode)) from items');
@@ -387,24 +400,28 @@ my $default_bib_view = get_default_view();
 $template->param(
     serialsadditems => $serialdatalist[0]->{'serialsadditems'},
     callnumber      => $serialdatalist[0]->{'callnumber'},
+    internalnotes   => $serialdatalist[0]->{'internalnotes'},
     bibliotitle     => $biblio->{'title'},
     biblionumber    => $serialdatalist[0]->{'biblionumber'},
     serialslist     => \@serialdatalist,
     default_bib_view => $default_bib_view,
     location         => $locationlib,
+    (uc(C4::Context->preference("marcflavour"))) => 1
+
 );
 output_html_with_http_headers $query, $cookie, $template->output;
 
 sub get_default_view {
     my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
-    my $views = { C4::Search::enabled_staff_search_views };
-    if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
+    my %views       = C4::Search::enabled_staff_search_views();
+    if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) {
         return 'ISBDdetail';
-    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+    }
+    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
         return 'MARCdetail';
-    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+    }
+    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
         return 'labeledMARCdetail';
-    } else {
-        return 'detail';
     }
+    return 'detail';
 }