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

(-)a/C4/VirtualShelves.pm (-1 / +1 lines)
Lines 471-477 sub ShelfPossibleAction { Link Here
471
    if ( $user > 0 and $action eq 'delete_shelf' ) {
471
    if ( $user > 0 and $action eq 'delete_shelf' ) {
472
        my $borrower = C4::Members::GetMember( borrowernumber => $user );
472
        my $borrower = C4::Members::GetMember( borrowernumber => $user );
473
        return 1
473
        return 1
474
            if C4::Auth::haspermission( $borrower->{userid}, { shelves => 'delete_shelves' } );
474
            if C4::Auth::haspermission( $borrower->{userid}, { shelves => 'delete_public_lists' } );
475
    }
475
    }
476
476
477
    my $dbh = C4::Context->dbh;
477
    my $dbh = C4::Context->dbh;
(-)a/installer/data/mysql/en/mandatory/userflags.sql (-1 / +1 lines)
Lines 18-22 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here
18
(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),
18
(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),
19
(18,'coursereserves','Course reserves',0),
19
(18,'coursereserves','Course reserves',0),
20
(19, 'plugins', 'Koha plugins', '0'),
20
(19, 'plugins', 'Koha plugins', '0'),
21
(20, 'shelves', 'Virtual shelves', 0)
21
(20, 'lists', 'Lists', 0)
22
;
22
;
(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (-1 / +1 lines)
Lines 72-76 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
72
   (19, 'tool', 'Use tool plugins'),
72
   (19, 'tool', 'Use tool plugins'),
73
   (19, 'report', 'Use report plugins'),
73
   (19, 'report', 'Use report plugins'),
74
   (19, 'configure', 'Configure plugins'),
74
   (19, 'configure', 'Configure plugins'),
75
   (20, 'delete_shelves', 'Delete shelves')
75
   (20, 'delete_public_lists', 'Delete public lists')
76
;
76
;
(-)a/installer/data/mysql/updatedatabase.pl (-4 / +3 lines)
Lines 9660-9672 $DBversion = "3.19.00.XXX"; Link Here
9660
if ( CheckVersion($DBversion) ) {
9660
if ( CheckVersion($DBversion) ) {
9661
    $dbh->do(q|
9661
    $dbh->do(q|
9662
        INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
9662
        INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
9663
        (20, 'shelves', 'Virtual shelves', 0)
9663
        (20, 'lists', 'Lists', 0)
9664
    |);
9664
    |);
9665
    $dbh->do(q|
9665
    $dbh->do(q|
9666
        INSERT INTO permissions (module_bit, code, description) VALUES
9666
        INSERT INTO permissions (module_bit, code, description) VALUES
9667
        (20, 'delete_shelves', 'Delete shelves')
9667
        (20, 'delete_public_lists', 'Delete public lists')
9668
    |);
9668
    |);
9669
    print "Upgrade to $DBversion done (Bug 13417: Add permission to delete shelves)\n";
9669
    print "Upgrade to $DBversion done (Bug 13417: Add permission to delete public lists)\n";
9670
    SetVersion ($DBversion);
9670
    SetVersion ($DBversion);
9671
}
9671
}
9672
9672
9673
- 

Return to bug 13417