Bugzilla – Attachment 136601 Details for
Bug 30650
Add a curbside pickup module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30650: Add link from the mainpage
Bug-30650-Add-link-from-the-mainpage.patch (text/plain), 4.04 KB, created by
Jonathan Druart
on 2022-06-27 13:26:20 UTC
(
hide
)
Description:
Bug 30650: Add link from the mainpage
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-06-27 13:26:20 UTC
Size:
4.04 KB
patch
obsolete
>From 76bc44d9389beea2f8ccb258a19a5530b0f18996 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 10 May 2022 09:24:16 +0200 >Subject: [PATCH] Bug 30650: Add link from the mainpage > >Sponsored-by: Association KohaLa - https://koha-fr.org/ >--- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 9 ++++++++- > mainpage.pl | 12 ++++++++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 8f121beab3a..f28d5e03b56 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -166,7 +166,7 @@ > <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('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %] >+ [% 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('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs || new_curbside_pickups.count %] > <div id="area-pending"> > [% IF pending_article_requests %] > <div class="pending-info" id="article_requests_pending"> >@@ -241,6 +241,13 @@ > </div> > [% END %] > >+ [% IF new_curbside_pickups.count %] >+ <div class="pending-info" id="new_curbside_pickups"> >+ <a href="/cgi-bin/koha/circ/curbside_pickups.pl">New curbside pickups </a> >+ <span class="pending-number-link">[% new_curbside_pickups.count | html %]</span> >+ </div> >+ [% END %] >+ > </div> > > [% END %] >diff --git a/mainpage.pl b/mainpage.pl >index 6972d398711..b34a46d8ed4 100755 >--- a/mainpage.pl >+++ b/mainpage.pl >@@ -34,6 +34,7 @@ use Koha::ProblemReports; > use Koha::Quotes; > use Koha::Suggestions; > use Koha::BackgroundJobs; >+use Koha::CurbsidePickups; > > my $query = CGI->new; > >@@ -108,6 +109,17 @@ unless ( $logged_in_user->has_permission( { parameters => 'manage_background_job > $template->param( already_ran_jobs => $already_ran_jobs ); > } > >+if ( C4::Context->preference('CurbsidePickup') ) { >+ $template->param( >+ new_curbside_pickups => Koha::CurbsidePickups->search( >+ { >+ branchcode => $homebranch, >+ scheduled_pickup_datetime => { '>' => \'DATE(NOW())' }, >+ } >+ )->filter_by_to_be_staged >+ ); >+} >+ > $template->param( > pendingcomments => $pendingcomments, > pendingtags => $pendingtags, >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30650
:
136584
|
136585
|
136586
|
136587
|
136588
|
136589
|
136590
|
136591
|
136592
|
136593
|
136594
|
136595
|
136596
|
136597
|
136598
|
136599
|
136600
|
136601
|
136602
|
136603
|
136604
|
136605
|
136606
|
136607
|
136608
|
136609
|
136610
|
137095
|
137100
|
137199
|
137211
|
137212
|
137277
|
137278
|
137279
|
137280
|
137281
|
137282
|
137283
|
137284
|
137285
|
137286
|
137287
|
137288
|
137289
|
137290
|
137291
|
137292
|
137293
|
137294
|
137295
|
137296
|
137297
|
137298
|
137299
|
137300
|
137301
|
137302
|
137303
|
137304
|
137305
|
137306
|
137307
|
138261
|
138262
|
138263
|
138264
|
138265
|
138266
|
138267
|
138268
|
138269
|
138270
|
138271
|
138272
|
138273
|
138274
|
138275
|
138276
|
138277
|
138278
|
138279
|
138280
|
138281
|
138282
|
138283
|
138284
|
138285
|
138286
|
138287
|
138288
|
138289
|
138290
|
138291
|
138292
|
138319
|
138320
|
138321
|
138322
|
138323
|
138324
|
138325
|
138330
|
138331
|
138332
|
138333
|
138334
|
138335
|
138336
|
138337
|
138338
|
138339
|
138340
|
138341
|
138342
|
138343
|
138344
|
138345
|
138346
|
138347
|
138348
|
138349
|
138350
|
138351
|
138352
|
138353
|
138354
|
138355
|
138356
|
138357
|
138358
|
138359
|
138360
|
138361
|
138362
|
138363
|
138364
|
138365
|
138366
|
138367
|
138368
|
138369
|
138375
|
138401
|
138610