Attachment #78887 for bug #20351

View | Details | Raw Unified | Return to bug 20351
Collapse All | Expand All

Lines 269-274 sub GetSubscription { Link Here

(-)a/C4/Serials.pm (+2 lines)
269	$sth->execute($subscriptionid);	269	$sth->execute($subscriptionid);
270	my $subscription = $sth->fetchrow_hashref;	270	my $subscription = $sth->fetchrow_hashref;
271		271
		272	return unless $subscription;
		273
272	$subscription->{cannotedit} = not can_edit_subscription( $subscription );	274	$subscription->{cannotedit} = not can_edit_subscription( $subscription );
273		275
274	# Add additional fields to the subscription into a new key "additional_fields"	276	# Add additional fields to the subscription into a new key "additional_fields"

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc (+2 lines)
7	<div class="dialog message">This bibliographic record does not exist.</div>	7	<div class="dialog message">This bibliographic record does not exist.</div>
8	[% CASE 'unknown_item' %]	8	[% CASE 'unknown_item' %]
9	<div class="dialog message">This item does not exist.</div>	9	<div class="dialog message">This item does not exist.</div>
		10	[% CASE 'unknown_subscription' %]
		11	<div class="dialog message">This subscription does not exist.</div>
10	[% CASE %][% blocking_error \| html %]	12	[% CASE %][% blocking_error \| html %]
11	[% END %]	13	[% END %]
12		14

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt (-1 / +9 lines)
7	[% INCLUDE 'header.inc' %]	7	[% INCLUDE 'header.inc' %]
8	[% INCLUDE 'serials-search.inc' %]	8	[% INCLUDE 'serials-search.inc' %]
9		9
10	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid \| html %]"><i>[% title \| html %]</i></a> &rsaquo; [% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %]</div>	10	<div id="breadcrumbs">
		11	<a href="/cgi-bin/koha/mainpage.pl">Home</a>
		12	&rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
		13	[% UNLESS blocking_error %]
		14	&rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid \| uri %]"><i>[% title \| html %]</i></a>
		15	&rsaquo; [% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %]
		16	[% END %]
		17	</div>
11		18
12	<div id="doc3" class="yui-t2">	19	<div id="doc3" class="yui-t2">
13		20
Lines 15-20 Link Here
15	<div id="yui-main">	22	<div id="yui-main">
16	<div class="yui-b">	23	<div class="yui-b">
17		24
		25	[% INCLUDE 'blocking_errors.inc' %]
18		26
19	[% IF ( op ) %]	27	[% IF ( op ) %]
20	<h1>Create routing list for <i>[% title \| html %]</i></h1>	28	<h1>Create routing list for <i>[% title \| html %]</i></h1>

Lines 18-24 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 / +8 lines)
18	[% INCLUDE 'header.inc' %]	18	[% INCLUDE 'header.inc' %]
19	[% INCLUDE 'serials-search.inc' %]	19	[% INCLUDE 'serials-search.inc' %]
20		20
21	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid \| html %]"><i>[% bibliotitle \| html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</div>	21	<div id="breadcrumbs">
		22	<a href="/cgi-bin/koha/mainpage.pl">Home</a>
		23	&rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
		24	[% UNLESS blocking_error %]
		25	&rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid \| uri %]"><i>[% bibliotitle \| html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]
		26	[% END %]
		27	</div>
		28	[% INCLUDE 'blocking_errors.inc' %]
22		29
23	<div class="main container-fluid">	30	<div class="main container-fluid">
24	<div class="row">	31	<div class="row">

Lines 16-22 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +5 lines)
16	[% INCLUDE 'header.inc' %]	16	[% INCLUDE 'header.inc' %]
17	[% INCLUDE 'serials-search.inc' %]	17	[% INCLUDE 'serials-search.inc' %]
18		18
19	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Details for subscription #[% subscriptionid \| html %]</div>	19	<div id="breadcrumbs">
		20	<a href="/cgi-bin/koha/mainpage.pl">Home</a>
		21	&rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
		22	[% UNLESS blocking_error %]&rsaquo; Details for subscription #[% subscriptionid \| html %][% END %]
		23	</div>
20		24
21	<div id="doc3" class="yui-t2">	25	<div id="doc3" class="yui-t2">
22		26

Lines 11-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt (+2 lines)
11	<body id="ser_subscription-renew" class="ser">	11	<body id="ser_subscription-renew" class="ser">
12	<div class="container-fluid">	12	<div class="container-fluid">
13		13
		14	[% INCLUDE 'blocking_errors.inc' %]
		15
14	[% IF op == 'renew' OR op =='multi_renew' %]	16	[% IF op == 'renew' OR op =='multi_renew' %]
15	[% IF op == 'renew' %]	17	[% IF op == 'renew' %]
16	<span>Subscription renewed.<span>	18	<span>Subscription renewed.<span>

Lines 61-66 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/serials/routing.pl (-1 / +6 lines)
61	}	61	}
62	);	62	);
63		63
		64	my $subs = GetSubscription($subscriptionid);
		65
		66	output_and_exit( $query, $cookie, $template, 'unknown_subscription')
		67	unless $subs;
		68
64	if($op eq 'delete'){	69	if($op eq 'delete'){
65	delroutingmember($routingid,$subscriptionid);	70	delroutingmember($routingid,$subscriptionid);
66	}	71	}
Lines 76-82 if($op eq 'save'){ Link Here
76	}	81	}
77		82
78	my @routinglist = getroutinglist($subscriptionid);	83	my @routinglist = getroutinglist($subscriptionid);
79	my $subs = GetSubscription($subscriptionid);	84
80	my ($count,@serials) = GetSerials($subscriptionid);	85	my ($count,@serials) = GetSerials($subscriptionid);
81	my $serialdates = GetLatestSerials($subscriptionid,$count);	86	my $serialdates = GetLatestSerials($subscriptionid,$count);
82		87

Lines 104-109 if($op eq 'gennext' && @subscriptionid){ Link Here

(-)a/serials/serials-collection.pl (+5 lines)
104	last if HasSubscriptionExpired($subscriptionid) > 0;	104	last if HasSubscriptionExpired($subscriptionid) > 0;
105	}	105	}
106	print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);	106	print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
		107	exit;
107	}	108	}
108		109
109	my $subscriptioncount;	110	my $subscriptioncount;
Lines 113-118 if (@subscriptionid){ Link Here
113	my $closed = 0;	114	my $closed = 0;
114	foreach my $subscriptionid (@subscriptionid){	115	foreach my $subscriptionid (@subscriptionid){
115	my $subs= GetSubscription($subscriptionid);	116	my $subs= GetSubscription($subscriptionid);
		117	next unless $subs;
116	$closed = 1 if $subs->{closed};	118	$closed = 1 if $subs->{closed};
117		119
118	$subs->{opacnote} =~ s/\n/\<br\/\>/g;	120	$subs->{opacnote} =~ s/\n/\<br\/\>/g;
Lines 134-139 if (@subscriptionid){ Link Here
134	my $tmpsubscription= GetFullSubscription($subscriptionid);	136	my $tmpsubscription= GetFullSubscription($subscriptionid);
135	@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);	137	@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
136	}	138	}
		139
		140	output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless @subscriptioninformation;
		141
137	$template->param(closed => $closed);	142	$template->param(closed => $closed);
138	$subscriptions=PrepareSerialsData(\@subscriptioninformation);	143	$subscriptions=PrepareSerialsData(\@subscriptioninformation);
139	$subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});	144	$subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});

Lines 114-119 unless ( @serialids ) { Link Here

(-)a/serials/serials-edit.pl (+1 lines)
114	$string =~ s/,$//;	114	$string =~ s/,$//;
115		115
116	print $query->redirect($string);	116	print $query->redirect($string);
		117	exit;
117	}	118	}
118		119
119	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	120	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(

Lines 69-74 if ($op eq 'modify' \|\| $op eq 'dup' \|\| $op eq 'modsubscription') { Link Here

(-)a/serials/subscription-add.pl (+3 lines)
69	my $subscriptionid = $query->param('subscriptionid');	69	my $subscriptionid = $query->param('subscriptionid');
70	$subs = GetSubscription($subscriptionid);	70	$subs = GetSubscription($subscriptionid);
71		71
		72	output_and_exit( $query, $cookie, $template, 'unknown_subscription')
		73	unless $subs;
		74
72	## FIXME : Check rights to edit if mod. Could/Should display an error message.	75	## FIXME : Check rights to edit if mod. Could/Should display an error message.
73	if ($subs->{'cannotedit'} && $op eq 'modify'){	76	if ($subs->{'cannotedit'} && $op eq 'modify'){
74	carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";	77	carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";

Lines 62-67 my ($template, $loggedinuser, $cookie) Link Here

(-)a/serials/subscription-detail.pl (+4 lines)
62		62
63		63
64	my $subs = GetSubscription($subscriptionid);	64	my $subs = GetSubscription($subscriptionid);
		65
		66	output_and_exit( $query, $cookie, $template, 'unknown_subscription')
		67	unless $subs;
		68
65	$subs->{enddate} \|\|= GetExpirationDate($subscriptionid);	69	$subs->{enddate} \|\|= GetExpirationDate($subscriptionid);
66		70
67	my ($totalissues,@serialslist) = GetSerials($subscriptionid);	71	my ($totalissues,@serialslist) = GetSerials($subscriptionid);

Lines 75-80 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/serials/subscription-renew.pl (-1 / +4 lines)
75	if ( $op eq "renew" ) {	75	if ( $op eq "renew" ) {
76	# Do not use this script with op=renew and @subscriptionids > 1!	76	# Do not use this script with op=renew and @subscriptionids > 1!
77	my $subscriptionid = $subscriptionids[0];	77	my $subscriptionid = $subscriptionids[0];
		78	# Make sure the subscription exists
		79	my $subscription = GetSubscription( $subscriptionid );
		80	output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless $subscription;
78	my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );	81	my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );
79	ReNewSubscription(	82	ReNewSubscription(
80	$subscriptionid, $loggedinuser,	83	$subscriptionid, $loggedinuser,
Lines 95-100 if ( $op eq "renew" ) { Link Here
95	} else {	98	} else {
96	my $subscriptionid = $subscriptionids[0];	99	my $subscriptionid = $subscriptionids[0];
97	my $subscription = GetSubscription($subscriptionid);	100	my $subscription = GetSubscription($subscriptionid);
		101	output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless $subscription;
98	if ($subscription->{'cannotedit'}){	102	if ($subscription->{'cannotedit'}){
99	carp "Attempt to renew subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";	103	carp "Attempt to renew subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
100	print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");	104	print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
101	-

Return to bug 20351