Bugzilla – Attachment 98655 Details for
Bug 24157
Additional acquisitions permissions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24157: New permission - delete_baskets
Bug-24157-New-permission---deletebaskets.patch (text/plain), 5.97 KB, created by
Martin Renvoize (ashimema)
on 2020-02-10 13:53:55 UTC
(
hide
)
Description:
Bug 24157: New permission - delete_baskets
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-02-10 13:53:55 UTC
Size:
5.97 KB
patch
obsolete
>From 632875a9ec9a87d6ea589226c6219d626e029193 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 11 Dec 2019 16:39:36 +0100 >Subject: [PATCH] Bug 24157: New permission - delete_baskets > >Add a new permission to delete acquisition baskets > >Test plan: >- Remove the new permission "delete_basket" for a given patron, >use it to log in into Koha >- Create basket, try to delete it >=> There is no way to delete it >- Add the permission >=> Now you can delete the basket > >Sponsored-by: Galway-Mayo Institute of Technology >--- > acqui/basket.pl | 6 ++++++ > installer/data/mysql/atomicupdate/bug_24157.perl | 6 +++++- > installer/data/mysql/userpermissions.sql | 1 + > koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 5 +++++ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 +++-- > 5 files changed, 20 insertions(+), 3 deletions(-) > >diff --git a/acqui/basket.pl b/acqui/basket.pl >index d248f11c92..932022ee11 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -91,6 +91,8 @@ our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( > } > ); > >+my $logged_in_patron = Koha::Patrons->find( $loggedinuser ); >+ > our $basket = GetBasket($basketno); > $booksellerid = $basket->{booksellerid} unless $booksellerid; > my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); >@@ -123,6 +125,10 @@ $template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2'; > my @messages; > > if ( $op eq 'delete_confirm' ) { >+ >+ output_and_exit( $query, $cookie, $template, 'insufficient_permission' ) >+ unless $logged_in_patron->has_permission( { acquisition => 'delete_baskets' } ); >+ > my $basketno = $query->param('basketno'); > my $delbiblio = $query->param('delbiblio'); > my @orders = GetOrders($basketno); >diff --git a/installer/data/mysql/atomicupdate/bug_24157.perl b/installer/data/mysql/atomicupdate/bug_24157.perl >index 031b7a0a39..e7908dd179 100644 >--- a/installer/data/mysql/atomicupdate/bug_24157.perl >+++ b/installer/data/mysql/atomicupdate/bug_24157.perl >@@ -10,6 +10,10 @@ if( CheckVersion( $DBversion ) ) { > (11, 'edit_invoices', 'Edit invoices') > |); > >+ $dbh->do(q| >+ INSERT IGNORE INTO permissions (module_bit, code, description) VALUES >+ (11, 'delete_baskets', 'Delete baskets') >+ |); > > $dbh->do(q| > INSERT IGNORE INTO permissions (module_bit, code, description) VALUES >@@ -17,5 +21,5 @@ if( CheckVersion( $DBversion ) ) { > |); > > SetVersion( $DBversion ); >- print "Upgrade to $DBversion done (Bug 24157: Add new permissions reopen_closed_invoices, edit_invoices delete_invoices)\n"; >+ print "Upgrade to $DBversion done (Bug 24157: Add new permissions reopen_closed_invoices, edit_invoices, delete_invoices, delete_baskets)\n"; > } >diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql >index f2203683e8..1b96935f36 100644 >--- a/installer/data/mysql/userpermissions.sql >+++ b/installer/data/mysql/userpermissions.sql >@@ -65,6 +65,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'reopen_closed_invoices', 'Reopen closed invoices'), > (11, 'edit_invoices', 'Edit invoices'), > (11, 'delete_invoices', 'Delete invoices'), >+ (11, 'delete_baskets', 'Delete baskets'), > (12, 'suggestions_manage', 'Manage purchase suggestions'), > (13, 'edit_news', 'Write news for the OPAC and staff interfaces'), > (13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >index d6c127916a..ece526de18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >@@ -682,6 +682,11 @@ > Delete invoices > </span> > <span class="permissioncode">([% name | html %])</span> >+ [%- CASE 'delete_baskets' -%] >+ <span class="sub_permission delete_baskets_subpermission"> >+ Delete baskets >+ </span> >+ <span class="permissioncode">([% name | html %])</span> > [%# self_check %] > [%- CASE 'self_checkin_module' -%] > <span class="sub_permission self_checkin_module_subpermission"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index c4d4d178dd..5378876be4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -59,8 +59,9 @@ > <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> > [% END %] > <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> >- [%# FIXME This action should not be available for everyone %] >- <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div> >+ [% IF CAN_user_acquisition_delete_baskets %] >+ <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div> >+ [% END %] > [% IF ( unclosable ) %] > [% ELSIF ( uncertainprices ) %] > <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> >-- >2.20.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 24157
:
96274
|
96275
|
96276
|
96277
|
96278
|
98651
|
98652
|
98653
|
98654
|
98655
|
100283
|
100284
|
100285
|
100286
|
100287
|
100288
|
107132
|
107133
|
107134
|
107135
|
107136
|
107137
|
107138
|
107139
|
107309
|
107346
|
107347
|
107348
|
107349
|
107350
|
107351
|
107352
|
107353
|
107354