Attachment #162002 for bug #36064

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

Lines 181-187 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +7 lines)
181	<div class="row">	181	<div class="row">
182	<div class="col-sm-12">	182	<div class="col-sm-12">
183	[%# Following statement must be in one line for translatability %]	183	[%# Following statement must be in one line for translatability %]
184	[% IF ( CAN_user_tools_moderate_comments && pendingcomments ) \|\| ( CAN_user_tools_moderate_tags && pendingtags ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) \|\| ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions \|\| all_pendingsuggestions )) \|\| ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) \|\| pending_article_requests \|\| ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) \|\| ( ( Koha.Preference('OpacCatalogConcerns') \|\| Koha.Preference('CatalogConcerns') ) && pending_biblio_tickets && CAN_user_editcatalogue_edit_catalogue ) \|\| ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) \|\| already_ran_jobs \|\| new_curbside_pickups.count \|\| ( holds_to_pull && CAN_user_circulate_circulate_remaining_permissions ) %]	184	[% IF ( CAN_user_tools_moderate_comments && pendingcomments ) \|\| ( CAN_user_tools_moderate_tags && pendingtags ) \|\| ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) \|\| ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions \|\| all_pendingsuggestions )) \|\| ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) \|\| pending_article_requests \|\| ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) \|\| ( ( Koha.Preference('OpacCatalogConcerns') \|\| Koha.Preference('CatalogConcerns') ) && pending_biblio_tickets && CAN_user_editcatalogue_edit_catalogue ) \|\| ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) \|\| already_ran_jobs \|\| new_curbside_pickups.count \|\| ( holds_to_pull && CAN_user_circulate_circulate_remaining_permissions ) \|\| ( holds_with_cancellation_requests && CAN_user_circulate_circulate_remaining_permissions ) %]
185	<div id="area-pending" class="page-section">	185	<div id="area-pending" class="page-section">
186	[% IF pending_article_requests %]	186	[% IF pending_article_requests %]
187	<div class="pending-info" id="article_requests_pending">	187	<div class="pending-info" id="article_requests_pending">
Lines 276-281 Link Here
276	<span class="pending-number-link">[% holds_to_pull \| html %]</span>	276	<span class="pending-number-link">[% holds_to_pull \| html %]</span>
277	</div>	277	</div>
278	[% END %]	278	[% END %]
		279	[% IF holds_with_cancellation_requests && CAN_user_circulate_circulate_remaining_permissions %]
		280	<div class="pending-info" id="holds_with_cancellation_requests">
		281	<a href="/cgi-bin/koha/circ/waitingreserves.pl?allbranches=1#holdscancelled_panel">Holds with cancellation requests</a>:
		282	<span class="pending-number-link">[% holds_with_cancellation_requests \| html %]</span>
		283	</div>
		284	[% END %]
279	</div>	285	</div>
280		286
281	[% END %]	287	[% END %]

Lines 129-134 unless ( $logged_in_user->has_permission( { parameters => 'manage_background_job Link Here

(-)a/mainpage.pl (-1 / +2 lines)
129	}	129	}
130		130
131	my $holds_to_pull = Koha::Holds->search( found => undef )->count;	131	my $holds_to_pull = Koha::Holds->search( found => undef )->count;
		132	my $holds_with_cancellation_requests = Koha::Holds->waiting->search()->filter_by_has_cancellation_requests->count;
132		133
133	if ( C4::Context->preference('CurbsidePickup') ) {	134	if ( C4::Context->preference('CurbsidePickup') ) {
134	$template->param(	135	$template->param(
Lines 148-153 $template->param( Link Here
148	pending_article_requests => $pending_article_requests,	149	pending_article_requests => $pending_article_requests,
149	pending_problem_reports => $pending_problem_reports,	150	pending_problem_reports => $pending_problem_reports,
150	holds_to_pull => $holds_to_pull,	151	holds_to_pull => $holds_to_pull,
		152	holds_with_cancellation_requests => $holds_with_cancellation_requests,
151	);	153	);
152		154
153	output_html_with_http_headers $query, $cookie, $template->output;	155	output_html_with_http_headers $query, $cookie, $template->output;
154	-

Return to bug 36064