Bug Fixing
Getting back to serials-collection when edit finished. subscription-renew is done in a popup.
This commit is contained in:
parent
2292d21387
commit
e3791f5966
|
|
@ -121,6 +121,7 @@ foreach my $tmpserialid (@serialids){
|
|||
my $data=GetSerialInformation($tmpserialid);
|
||||
$data->{publisheddate}=format_date($data->{publisheddate});
|
||||
$data->{planneddate}=format_date($data->{planneddate});
|
||||
$data->{'editdisable'}=(HasSubscriptionExpired($data->{subscriptionid})&& $data->{'status1'});
|
||||
push @serialdatalist,$data;
|
||||
}
|
||||
my $bibdata=GetBiblioData($serialdatalist[0]->{'biblionumber'});
|
||||
|
|
@ -135,12 +136,14 @@ foreach my $subscriptionid (@subscriptionids){
|
|||
PrepareItemrecordDisplay( $serialdatalist[0]->{'biblionumber'} );
|
||||
}
|
||||
$cell->{'subscriptionid'}=$subscriptionid;
|
||||
$cell->{'subscriptionexpired'}=HasSubscriptionExpired($subscriptionid);
|
||||
$cell->{'itemid'} = "NNEW";
|
||||
$cell->{'serialid'} = "NEW";
|
||||
$cell->{'issuesatonce'} = 1;
|
||||
push @newserialloop,$cell;
|
||||
push @subscriptionloop, {'subscriptionid'=>$subscriptionid};
|
||||
push @subscriptionloop, {'subscriptionid'=>$subscriptionid,
|
||||
'abouttoexpire'=>abouttoexpire($subscriptionid),
|
||||
'subscriptionexpired'=>HasSubscriptionExpired($subscriptionid),
|
||||
};
|
||||
}
|
||||
$template->param(newserialloop=>\@newserialloop);
|
||||
$template->param(subscriptions=>\@subscriptionloop);
|
||||
|
|
@ -248,13 +251,18 @@ if ($op eq 'serialchangestatus') {
|
|||
}
|
||||
}
|
||||
}
|
||||
### FIXME this part of code is not very pretty. Nor is it very efficient... There MUST be a more perlish way to write it. But it works.
|
||||
my $redirect ="serials-home.pl?";
|
||||
$redirect.=join("&",map{"serialseq=".$_} @serialseqs);
|
||||
$redirect.="&".join("&",map{"planneddate=".$_} @planneddates);
|
||||
$redirect.="&".join("&",map{"publisheddate=".$_} @publisheddates);
|
||||
$redirect.="&".join("&",map{"status=".$_} @status);
|
||||
$redirect.="&".join("&",map{"notes=".$_} @notes);
|
||||
# ### FIXME this part of code is not very pretty. Nor is it very efficient... There MUST be a more perlish way to write it. But it works.
|
||||
# my $redirect ="serials-home.pl?";
|
||||
# $redirect.=join("&",map{"serialseq=".$_} @serialseqs);
|
||||
# $redirect.="&".join("&",map{"planneddate=".$_} @planneddates);
|
||||
# $redirect.="&".join("&",map{"publisheddate=".$_} @publisheddates);
|
||||
# $redirect.="&".join("&",map{"status=".$_} @status);
|
||||
# $redirect.="&".join("&",map{"notes=".$_} @notes);
|
||||
|
||||
my $redirect ="serials-collection.pl?";
|
||||
my %hashsubscription;
|
||||
map{$hashsubscription{$_}=1} @subscriptionids;
|
||||
$redirect.=join("&",map{"subscriptionid=".$_} sort keys %hashsubscription);
|
||||
print $query->redirect("$redirect");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ if ($op eq 'del') {
|
|||
|
||||
}
|
||||
my $subs = &GetSubscription($subscriptionid);
|
||||
# use Data::Dumper; warn $subscriptionid; warn Dumper($subs);
|
||||
my ($routing, @routinglist) = getroutinglist($subscriptionid);
|
||||
my ($totalissues,@serialslist) = GetSerials($subscriptionid);
|
||||
$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ use C4::Serials;
|
|||
my $query = new CGI;
|
||||
my $dbh = C4::Context->dbh;
|
||||
|
||||
my $mode = $query->param('mode');
|
||||
my $op = $query->param('op');
|
||||
my $subscriptionid = $query->param('subscriptionid');
|
||||
my $done = 0; # for after form has been submitted
|
||||
|
|
@ -80,9 +81,7 @@ if ( $op eq "renew" ) {
|
|||
$query->param('startdate'), $query->param('numberlength'),
|
||||
$query->param('weeklength'), $query->param('monthlength'),
|
||||
$query->param('note')
|
||||
);
|
||||
print $query->redirect('/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid='.$subscriptionid);
|
||||
exit;
|
||||
);
|
||||
}
|
||||
|
||||
my $subscription = GetSubscription($subscriptionid);
|
||||
|
|
@ -98,7 +97,7 @@ $template->param(
|
|||
subscriptionid => $subscriptionid,
|
||||
bibliotitle => $subscription->{bibliotitle},
|
||||
$op => 1,
|
||||
done => $done,
|
||||
popup => ($query->param('mode')eq "popup"),
|
||||
);
|
||||
|
||||
# Print the page
|
||||
|
|
|
|||
Loading…
Reference in New Issue