Attachment #165796 for bug #36064

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




                <div class="row">
                    <div class="col-sm-12">
                        [%# Following statement must be in one line for translatability %]
                        [% 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_with_cancellation_requests  && CAN_user_circulate_circulate_remaining_permissions ) %]
                            <div id="area-pending" class="page-section">
                                [% IF pending_article_requests %]
                                <div class="pending-info" id="article_requests_pending">

                                    </div>
                                [% END %]

                                [% IF holds_with_cancellation_requests  && CAN_user_circulate_circulate_remaining_permissions %]
                                    <div class="pending-info" id="holds_with_cancellation_requests">
                                        <a href="/cgi-bin/koha/circ/waitingreserves.pl?allbranches=1#holdscancelled_panel">Holds with cancellation requests</a>:
                                        <span class="pending-number-link">[% holds_with_cancellation_requests | html %]</span>
                                    </div>
                                [% END %]
                            </div>

Lines 127-133 unless ( $logged_in_user->has_permission( { parameters => 'manage_background_job Link Here

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

Return to bug 36064

Lines 180-186 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-5 / +5 lines)
180	<div class="row">	180	<div class="row">
181	<div class="col-sm-12">	181	<div class="col-sm-12">
182	[%# Following statement must be in one line for translatability %]	182	[%# Following statement must be in one line for translatability %]
183	[% 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 ) %]	183	[% 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_with_cancellation_requests && CAN_user_circulate_circulate_remaining_permissions ) %]
184	<div id="area-pending" class="page-section">	184	<div id="area-pending" class="page-section">
185	[% IF pending_article_requests %]	185	[% IF pending_article_requests %]
186	<div class="pending-info" id="article_requests_pending">	186	<div class="pending-info" id="article_requests_pending">
Lines 269-278 Link Here
269	</div>	269	</div>
270	[% END %]	270	[% END %]
271		271
272	[% IF holds_to_pull && CAN_user_circulate_circulate_remaining_permissions %]	272	[% IF holds_with_cancellation_requests && CAN_user_circulate_circulate_remaining_permissions %]
273	<div class="pending-info" id="holds_to_pull">	273	<div class="pending-info" id="holds_with_cancellation_requests">
274	<a href="/cgi-bin/koha/circ/pendingreserves.pl">New holds to pull</a>:	274	<a href="/cgi-bin/koha/circ/waitingreserves.pl?allbranches=1#holdscancelled_panel">Holds with cancellation requests</a>:
275	<span class="pending-number-link">[% holds_to_pull \| html %]</span>	275	<span class="pending-number-link">[% holds_with_cancellation_requests \| html %]</span>
276	</div>	276	</div>
277	[% END %]	277	[% END %]
278	</div>	278	</div>