Attachment #112620 for bug #19532

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

Lines 12-18 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc (-1 / +1 lines)
12	[% END %]	12	[% END %]
13		13
14	[% IF Koha.Preference('UseRecalls') %]	14	[% IF Koha.Preference('UseRecalls') %]
15	<li><a class="recall btn btn-link btn-lg" href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber \| html %]"><i class="fa fa-fw fa-bookmark-o"></i>	15	<li><a class="recall btn btn-link btn-lg" href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% biblio.biblionumber \| html %]"><i class="fa fa-fw fa-bookmark-o" aria-hidden="true"></i>
16	Place recall</a></li>	16	Place recall</a></li>
17	[% END %]	17	[% END %]
18		18

Lines 151-157 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt (-1 / +1 lines)
151	<fieldset class="action">	151	<fieldset class="action">
152	<input type="hidden" name="op" value="request">	152	<input type="hidden" name="op" value="request">
153	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">	153	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">
154	<input type="submit" class="btn" value="Confirm">	154	<input type="submit" class="btn btn-primary" value="Confirm">
155	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber \| uri %]" class="cancel">Cancel</a>	155	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber \| uri %]" class="cancel">Cancel</a>
156	</fieldset>	156	</fieldset>
157	</form>	157	</form>

Lines 740-746 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +2 lines)
740	<input type="hidden" name="op" value="cancel">	740	<input type="hidden" name="op" value="cancel">
741	<input type="hidden" name="recall_id" value="[% RECALL.recall_id \| html %]">	741	<input type="hidden" name="recall_id" value="[% RECALL.recall_id \| html %]">
742	<input type="hidden" name="biblionumber" value="[% RECALL.biblionumber \| html %]">	742	<input type="hidden" name="biblionumber" value="[% RECALL.biblionumber \| html %]">
743	<button type="submit" name="submit" class="btn btn-sm btn-danger" id="cancel_recall"><i class="icon-remove icon-white"></i> Cancel</button>	743	<button type="submit" name="submit" class="btn btn-sm btn-danger cancel_recall"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
744	</form>	744	</form>
745	[% END %]	745	[% END %]
746	</td>	746	</td>
Lines 1077-1083 Link Here
1077	});	1077	});
1078	}	1078	}
1079		1079
1080	$("#cancel_recall").click(function(e){	1080	$(".cancel_recall").click(function(e){
1081	return confirmDelete(_("Are you sure you want to remove this recall?"));	1081	return confirmDelete(_("Are you sure you want to remove this recall?"));
1082	});	1082	});
1083	});	1083	});

Lines 27-33 my ($template, $loggedinuser, $cookie)= get_template_and_user( Link Here

(-)a/members/recallshistory.pl (-1 lines)
27	template_name => "members/recallshistory.tt",	27	template_name => "members/recallshistory.tt",
28	query => $input,	28	query => $input,
29	type => "intranet",	29	type => "intranet",
30	authnotrequired => 0,
31	flagsrequired => { recalls => 1 },	30	flagsrequired => { recalls => 1 },
32	debug => 1,	31	debug => 1,
33	}	32	}

Lines 29-35 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-recall.pl (-1 lines)
29	template_name => "opac-recall.tt",	29	template_name => "opac-recall.tt",
30	query => $query,	30	query => $query,
31	type => "opac",	31	type => "opac",
32	authnotrequired => 0,
33	}	32	}
34	);	33	);
35		34

Lines 29-35 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-recalls.pl (-1 lines)
29	template_name => "opac-recalls.tt",	29	template_name => "opac-recalls.tt",
30	query => $input,	30	query => $input,
31	type => "opac",	31	type => "opac",
32	authnotrequired => 0,
33	}	32	}
34	);	33	);
35		34

Lines 30-36 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/recalls/recall_pickup_slip.pl (-1 lines)
30	template_name => "circ/printslip.tt",	30	template_name => "circ/printslip.tt",
31	query => $input,	31	query => $input,
32	type => "intranet",	32	type => "intranet",
33	authnotrequired => 0,
34	flagsrequired => { circulate => "circulate_remaining_permissions" },	33	flagsrequired => { circulate => "circulate_remaining_permissions" },
35	}	34	}
36	);	35	);

Lines 28-34 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/recalls/recalls_old_queue.pl (-1 lines)
28	template_name => "recalls/recalls_old_queue.tt",	28	template_name => "recalls/recalls_old_queue.tt",
29	query => $query,	29	query => $query,
30	type => "intranet",	30	type => "intranet",
31	authnotrequired => 0,
32	flagsrequired => { recalls => "manage_recalls" },	31	flagsrequired => { recalls => "manage_recalls" },
33	debug => 1,	32	debug => 1,
34	}	33	}

Lines 29-35 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/recalls/recalls_overdue.pl (-1 lines)
29	template_name => "recalls/recalls_overdue.tt",	29	template_name => "recalls/recalls_overdue.tt",
30	query => $query,	30	query => $query,
31	type => "intranet",	31	type => "intranet",
32	authnotrequired => 0,
33	flagsrequired => { recalls => "manage_recalls" },	32	flagsrequired => { recalls => "manage_recalls" },
34	debug => 1,	33	debug => 1,
35	}	34	}

Lines 28-34 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/recalls/recalls_queue.pl (-1 lines)
28	template_name => "recalls/recalls_queue.tt",	28	template_name => "recalls/recalls_queue.tt",
29	query => $query,	29	query => $query,
30	type => "intranet",	30	type => "intranet",
31	authnotrequired => 0,
32	flagsrequired => { recalls => 'manage_recalls' },	31	flagsrequired => { recalls => 'manage_recalls' },
33	debug => 1,	32	debug => 1,
34	}	33	}

Lines 28-34 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/recalls/recalls_to_pull.pl (-1 lines)
28	template_name => "recalls/recalls_to_pull.tt",	28	template_name => "recalls/recalls_to_pull.tt",
29	query => $query,	29	query => $query,
30	type => "intranet",	30	type => "intranet",
31	authnotrequired => 0,
32	flagsrequired => { recalls => 'manage_recalls' },	31	flagsrequired => { recalls => 'manage_recalls' },
33	debug => 1,	32	debug => 1,
34	}	33	}

Lines 31-37 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/recalls/recalls_waiting.pl (-1 lines)
31	template_name => "recalls/recalls_waiting.tt",	31	template_name => "recalls/recalls_waiting.tt",
32	query => $query,	32	query => $query,
33	type => "intranet",	33	type => "intranet",
34	authnotrequired => 0,
35	flagsrequired => { recalls => "manage_recalls" },	34	flagsrequired => { recalls => "manage_recalls" },
36	debug => 1,	35	debug => 1,
37	}	36	}

Lines 30-36 my ($template, $loggedinuser, $cookie)= get_template_and_user( Link Here

(-)a/recalls/request.pl (-1 lines)
30	template_name => "recalls/request.tt",	30	template_name => "recalls/request.tt",
31	query => $input,	31	query => $input,
32	type => "intranet",	32	type => "intranet",
33	authnotrequired => 0,
34	flagsrequired => { recalls => "manage_recalls" },	33	flagsrequired => { recalls => "manage_recalls" },
35	debug => 1,	34	debug => 1,
36	}	35	}

Lines 278-284 Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/Circulation.t (-1 / +1 lines)
278		278
279	my ( $reused_itemnumber_1, $reused_itemnumber_2 );	279	my ( $reused_itemnumber_1, $reused_itemnumber_2 );
280	subtest "CanBookBeRenewed tests" => sub {	280	subtest "CanBookBeRenewed tests" => sub {
281	plan tests => 87;	281	plan tests => 91;
282		282
283	C4::Context->set_preference('ItemsDeniedRenewal','');	283	C4::Context->set_preference('ItemsDeniedRenewal','');
284	# Generate test biblio	284	# Generate test biblio

Lines 19-25 Link Here

(-)a/t/db_dependent/Koha/Patron.t (-1 / +1 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Test::More tests => 6;	22	use Test::More tests => 7;
23	use Test::Exception;	23	use Test::Exception;
24		24
25	use Koha::Database;	25	use Koha::Database;

Return to bug 19532