X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fserials-edit.pl;h=b80fa46f21d9e5d69ee305ca9423ca19cd6113eb;hb=a3087d76bd31f59ac437e63d7031b2202cb64e5c;hp=76a6bf0b250d34aecb82573d1bc2a137fcaf0a81;hpb=9d6d641d1f8b77271800f43bc027b651f9aea52b;p=koha-ffzg.git

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 76a6bf0b25..b80fa46f21 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -72,7 +72,7 @@ use C4::Context;
 use C4::Serials qw( GetSerials GetSerials2 GetSerialInformation HasSubscriptionExpired GetSubscription abouttoexpire NewIssue ModSerialStatus GetPreviousSerialid AddItem2Serial );
 use C4::Search qw( enabled_staff_search_views );
 
-use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 use Koha::Serial::Items;
 
@@ -128,7 +128,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my @serialdatalist;
 my %processedserialid;
 
-my $today = output_pref( { dt => dt_from_string, dateonly => 1 } );
+my $today = dt_from_string;
 
 foreach my $serialid (@serialids) {
 
@@ -140,14 +140,6 @@ foreach my $serialid (@serialids) {
     {
         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{};
-            }
-            else {
-                $serinfo->{$d} = output_pref( { dt => dt_from_string( $serinfo->{$d} ), dateonly => 1 } );
-            }
-        }
         $serinfo->{arriveddate} = $today;
 
         $serinfo->{'editdisable'} = (
@@ -216,10 +208,10 @@ if ( $op and $op eq 'serialchangestatus' ) {
         my ($plan_date, $pub_date);
 
         if (defined $planneddates[$i] && $planneddates[$i] ne 'XXX') {
-            $plan_date = eval { output_pref( { dt => dt_from_string( $planneddates[$i] ), dateonly => 1, dateformat => 'iso' } ); };
+            $plan_date = $planneddates[$i];
         }
         if (defined $publisheddates[$i] && $publisheddates[$i] ne 'XXX') {
-            $pub_date = eval { output_pref( { dt => dt_from_string( $publisheddates[$i] ), dateonly => 1, dateformat => 'iso' } ); };
+            $pub_date = $publisheddates[$i];
         }
 
         if ( $serialids[$i] && $serialids[$i] eq 'NEW' ) {
@@ -285,8 +277,6 @@ if ( $op and $op eq 'serialchangestatus' ) {
         my @serials      = $query->multi_param('serial');
         my @bibnums      = $query->multi_param('bibnum');
         my @itemid       = $query->multi_param('itemid');
-        my @ind_tag      = $query->multi_param('ind_tag');
-        my @indicator    = $query->multi_param('indicator');
         my @num_copies   = $query->multi_param('number_of_copies');
 
         #Rebuilding ALL the data for items into a hash
@@ -313,8 +303,6 @@ if ( $op and $op eq 'serialchangestatus' ) {
             push @{ $itemhash{ $itemid[$i] }->{'subfields'} }, $subfields[$i];
             push @{ $itemhash{ $itemid[$i] }->{'field_values'} },
               $field_values[$i];
-            push @{ $itemhash{ $itemid[$i] }->{'ind_tag'} },   $ind_tag[$i];
-            push @{ $itemhash{ $itemid[$i] }->{'indicator'} }, $indicator[$i];
         }
         foreach my $item ( keys %itemhash ) {
 
@@ -334,8 +322,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
                     $itemhash{$item}->{'tags'},
                     $itemhash{$item}->{'subfields'},
                     $itemhash{$item}->{'field_values'},
-                    $itemhash{$item}->{'indicator'},
-                    $itemhash{$item}->{'ind_tag'}
+                    undef,
+                    undef
                 );
 
                 # warn $xml;
@@ -429,7 +417,6 @@ if ( $op and $op eq 'serialchangestatus' ) {
     }
 }
 my $location = $serialdatalist[0]->{'location'};
-my $default_bib_view = get_default_view();
 
 $template->param(
     subscriptionid  => $serialdatalist[0]->{subscriptionid},
@@ -439,24 +426,8 @@ $template->param(
     bibliotitle     => $biblio->title,
     biblionumber    => $serialdatalist[0]->{'biblionumber'},
     serialslist     => \@serialdatalist,
-    default_bib_view => $default_bib_view,
     location         => $location,
     (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} ) {
-        return 'ISBDdetail';
-    }
-    elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) {
-        return 'MARCdetail';
-    }
-    elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) {
-        return 'labeledMARCdetail';
-    }
-    return 'detail';
-}