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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-2 / +8 lines)
Lines 180-186 Link Here
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 %]
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 268-274 Link Here
268
                                        <span class="pending-number-link">[% new_curbside_pickups.count | html %]</span>
268
                                        <span class="pending-number-link">[% new_curbside_pickups.count | html %]</span>
269
                                    </div>
269
                                    </div>
270
                                [% END %]
270
                                [% END %]
271
271
                                
272
                                [% IF holds_with_cancellation_requests  && CAN_user_circulate_circulate_remaining_permissions %]
273
                                    <div class="pending-info" id="holds_with_cancellation_requests">
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_with_cancellation_requests | html %]</span>
276
                                    </div>
277
                                [% END %]
272
                            </div>
278
                            </div>
273
279
274
                        [% END %]
280
                        [% END %]
(-)a/mainpage.pl (-2 / +4 lines)
Lines 125-130 unless ( $logged_in_user->has_permission( { parameters => 'manage_background_job Link Here
125
    $template->param( already_ran_jobs => $already_ran_jobs );
125
    $template->param( already_ran_jobs => $already_ran_jobs );
126
}
126
}
127
127
128
my $holds_with_cancellation_requests = Koha::Holds->waiting->search()->filter_by_has_cancellation_requests->count;
129
128
if ( C4::Context->preference('CurbsidePickup') ) {
130
if ( C4::Context->preference('CurbsidePickup') ) {
129
    $template->param(
131
    $template->param(
130
        new_curbside_pickups => Koha::CurbsidePickups->search(
132
        new_curbside_pickups => Koha::CurbsidePickups->search(
Lines 141-147 $template->param( Link Here
141
    pending_borrower_modifications => $pending_borrower_modifications,
143
    pending_borrower_modifications => $pending_borrower_modifications,
142
    pending_discharge_requests     => $pending_discharge_requests,
144
    pending_discharge_requests     => $pending_discharge_requests,
143
    pending_article_requests       => $pending_article_requests,
145
    pending_article_requests       => $pending_article_requests,
144
    pending_problem_reports        => $pending_problem_reports
146
    pending_problem_reports        => $pending_problem_reports,
147
    holds_with_cancellation_requests => $holds_with_cancellation_requests,
145
);
148
);
146
149
147
output_html_with_http_headers $query, $cookie, $template->output;
150
output_html_with_http_headers $query, $cookie, $template->output;
148
- 

Return to bug 36064