bug 3564 follow: ensure NoZebra is passed to templates

[koha.git] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index a96857e..8fcea93 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -20,6 +20,16 @@ my $order = $input->param('order');
 my %supplierlist = GetSuppliersWithLateIssues;
 my @select_supplier;
 
+# open template first (security & userenv set here)
+my ($template, $loggedinuser, $cookie)
+= get_template_and_user({template_name => "serials/claims.tmpl",
+            query => $input,
+            type => "intranet",
+            authnotrequired => 0,
+            flagsrequired => {serials => 1},
+            debug => 1,
+            });
+
 foreach my $supplierid (sort {$supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist){
         my ($count, @dummy) = GetLateOrMissingIssues($supplierid,"",$order);
         my $counting = $count;
@@ -33,16 +43,16 @@ foreach (keys %$letters){
     push @letters ,{code=>$_,name=> $letters->{$_}};
 }
 
-my $letter=((scalar(@letters)>1)||($letters[0]->{name}||$letters[0]->{code}));
+my $letter=((scalar(@letters)>1) || ($letters[0]->{name}||$letters[0]->{code}));
 my ($count2, @missingissues) = GetLateOrMissingIssues($supplierid,$serialid,$order) if $supplierid;
 
 my $CGIsupplier=CGI::scrolling_list( -name     => 'supplierid',
+                       -id        => 'supplierid',
                        -values   => \@select_supplier,
                        -default  => $supplierid,
                        -labels   => \%supplierlist,
                        -size     => 1,
-                       -multiple => 0 
-            -onChange => 'onchange="submit();"');
+                       -multiple => 0 );
 
 my ($singlesupplier,@supplierinfo);
 if($supplierid){
@@ -53,28 +63,18 @@ if($supplierid){
    }
 }
 
-
 my $preview=0;
 if($op eq 'preview'){
     $preview = 1;
+} else {
+    my @serialnums=$input->param('serialid');
+    if (@serialnums) { # i.e. they have been flagged to generate claims
+        SendAlerts('claimissues',\@serialnums,$input->param("letter_code"));
+        my $cntupdate=UpdateClaimdateIssues(\@serialnums);
+        ### $cntupdate SHOULD be equal to scalar(@$serialnums)  TODO so what do we do about it??
+    }
 }
 
-if ($op eq "send_alert"){
-  my @serialnums=$input->param("serialid");
-  SendAlerts('claimissues',\@serialnums,$input->param("letter_code"));
-  my $cntupdate=UpdateClaimdateIssues(\@serialnums);
-  ### $cntupdate SHOULD be equal to scalar(@$serialnums)
-}
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/claims.tmpl",
-                               query => $input,
-                               type => "intranet",
-                               authnotrequired => 0,
-                               flagsrequired => {serials => 1},
-                               debug => 1,
-                               });
-
 $template->param('letters'=>\@letters,'letter'=>$letter);
 $template->param(
         order =>$order,
@@ -88,8 +88,6 @@ $template->param(
         claimletter => $claimletter,
         singlesupplier => $singlesupplier,
         supplierloop => \@supplierinfo,
-        intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-        IntranetNav => C4::Context->preference("IntranetNav"),
+        dateformat    => C4::Context->preference("dateformat"),
         );
 output_html_with_http_headers $input, $cookie, $template->output;