syncing dev-week and HEAD

This commit is contained in:
kados 2006-05-21 02:29:09 +00:00
parent f358be8c66
commit e61173aa8e
6 changed files with 6 additions and 32 deletions

View File

@ -25,17 +25,10 @@ my $biblionumber = $query->param('biblionumber');
if ($selectview eq "full"){
my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
# now, check is there is an alert subscription for one of the subscriptions
foreach (@$subscriptions) {
if (getalert($loggedinuser,'issue',$_->{subscriptionid})) {
warn "SUBSCRIPTION FOR : $loggedinuser,'issue',$_->{subscriptionid}";
}
}
my $title = $subscriptions->[0]{bibliotitle};
my $yearmin=$subscriptions->[0]{year};
my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
query => $query,
@ -60,13 +53,6 @@ if ($selectview eq "full"){
} else {
my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
# now, check is there is an alert subscription for one of the subscriptions
foreach (@$subscriptions) {
if (getalert($loggedinuser,'issue',$_->{subscriptionid})) {
$_->{hasalert} = 1;
}
}
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-serial-issues.tmpl",
query => $query,
@ -81,8 +67,6 @@ if ($selectview eq "full"){
$template->param(
biblionumber => $query->param('biblionumber'),
subscription_LOOP => $subscriptions,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
);
}
output_html_with_http_headers $query, $cookie, $template->output;

View File

@ -58,8 +58,6 @@ if ($query->param('modifyshelfcontents')) {
my ($shelflist) = GetShelfList($loggedinuser,2);
$template->param({ loggedinuser => $loggedinuser,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
});
SWITCH: {
if ($query->param('op') eq 'modifsave') {
@ -186,6 +184,9 @@ sub viewshelf {
#
# $Log$
# Revision 1.8 2006/05/21 02:30:17 kados
# syncing dev-week and HEAD
#
# Revision 1.7 2005/05/04 09:02:38 tipaul
# synch'ing 2.2 and head
#

View File

@ -27,8 +27,6 @@ $template->param(INPUTS => \@inputs);
my $self_url = $query->url(-absolute => 1);
$template->param(url => $self_url,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
);
output_html_with_http_headers $query, $cookie, $template->output;

View File

@ -149,12 +149,8 @@ foreach (@$alerts) {
}
$template->param(waiting_count => $wcount,
LibraryName => C4::Context->preference("LibraryName"),
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
textmessaging => $borr->{textmessaging},
alertloop => $alerts,
OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
);
output_html_with_http_headers $query, $cookie, $template->output;

View File

@ -32,9 +32,7 @@ $borr->{'ethnicity'} = fixEthnicity($borr->{'ethnicity'});
$template->param($borr);
$template->param(LibraryName => C4::Context->preference("LibraryName"),
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
);
);
output_html_with_http_headers $query, $cookie, $template->output;

View File

@ -88,9 +88,6 @@ my @bordat;
$bordat[0] = $borr;
$template->param(BORROWER_INFO => \@bordat,
LibraryName => C4::Context->preference("LibraryName"),
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
);
output_html_with_http_headers $query, $cookie, $template->output;