Bugzilla – Attachment 138351 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: Split the permission
Bug-30650-Split-the-permission.patch (text/plain), 3.89 KB, created by
Katrin Fischer
on 2022-07-29 16:19:46 UTC
(
hide
)
Description:
Bug 30650: Split the permission
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-07-29 16:19:46 UTC
Size:
3.89 KB
patch
obsolete
>From 7e2af42c34cf7eea77ea5ab528870a9ea525eb90 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 15 Jun 2022 10:03:28 +0200 >Subject: [PATCH] Bug 30650: Split the permission > >We actually want one permission to manage the administration page, and >one for the circulation module. > >Signed-off-by: Koha Team University Lyon 3 <koha@univ-lyon3.fr> > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > circ/curbside_pickups.pl | 2 +- > installer/data/mysql/atomicupdate/bug_30650.pl | 7 ++++++- > installer/data/mysql/mandatory/userpermissions.sql | 1 + > .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 2 +- > 4 files changed, 9 insertions(+), 3 deletions(-) > >diff --git a/circ/curbside_pickups.pl b/circ/curbside_pickups.pl >index e3223e3dc8..1de97f9c84 100755 >--- a/circ/curbside_pickups.pl >+++ b/circ/curbside_pickups.pl >@@ -38,7 +38,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > template_name => "circ/curbside_pickups.tt", > query => $input, > type => "intranet", >- flagsrequired => { parameters => 'manage_curbside_pickups' }, >+ flagsrequired => { circulate => 'manage_curbside_pickups' }, > } > ); > >diff --git a/installer/data/mysql/atomicupdate/bug_30650.pl b/installer/data/mysql/atomicupdate/bug_30650.pl >index 068b29d66c..53015d2c43 100755 >--- a/installer/data/mysql/atomicupdate/bug_30650.pl >+++ b/installer/data/mysql/atomicupdate/bug_30650.pl >@@ -171,7 +171,12 @@ return { > $dbh->do(qq{ > INSERT IGNORE permissions (module_bit, code, description) > VALUES >- (3, 'manage_curbside_pickups', 'Manage curbside pickups') >+ (1, 'manage_curbside_pickups', 'Manage curbside pickups (circulation)') >+ }); >+ $dbh->do(qq{ >+ INSERT IGNORE permissions (module_bit, code, description) >+ VALUES >+ (3, 'manage_curbside_pickups', 'Manage curbside pickups (admin)') > }); > > unless ( column_exists('curbside_pickup_policy', 'enable_waiting_holds_only') ) { >diff --git a/installer/data/mysql/mandatory/userpermissions.sql b/installer/data/mysql/mandatory/userpermissions.sql >index b8037d162e..612d17233f 100644 >--- a/installer/data/mysql/mandatory/userpermissions.sql >+++ b/installer/data/mysql/mandatory/userpermissions.sql >@@ -5,6 +5,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 1, 'force_checkout', 'Force checkout if a limitation exists'), > ( 1, 'manage_restrictions', 'Manage restrictions for accounts'), > ( 1, 'manage_checkout_notes', 'Mark checkout notes as seen/not seen'), >+ ( 1, 'manage_curbside_pickups', 'Manage curbside pickups'), > ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'), > ( 3, 'manage_accounts', 'Manage Account Debit and Credit Types' ), > ( 3, 'manage_circ_rules', 'Manage circulation rules'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index c8732dbe9a..bbdfb78873 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -83,7 +83,7 @@ > <li> > <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a> > </li> >- [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_parameters_manage_curbside_pickups ) %] >+ [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %] > <li> > <a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa fa-refresh"></i> Curbside Pickups</a> > </li> >-- >2.30.2
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