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

(-)a/C4/VirtualShelves.pm (-1 / +1 lines)
Lines 466-472 sub ShelfPossibleAction { Link Here
466
    if ( $user > 0 and $action eq 'delete_shelf' ) {
466
    if ( $user > 0 and $action eq 'delete_shelf' ) {
467
        my $borrower = C4::Members::GetMember( borrowernumber => $user );
467
        my $borrower = C4::Members::GetMember( borrowernumber => $user );
468
        return 1
468
        return 1
469
            if C4::Auth::haspermission( $borrower->{userid}, { shelves => 'delete_shelves' } );
469
            if C4::Auth::haspermission( $borrower->{userid}, { shelves => 'delete_public_lists' } );
470
    }
470
    }
471
471
472
    my $dbh = C4::Context->dbh;
472
    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 9763-9775 $DBversion = "3.19.00.XXX"; Link Here
9763
if ( CheckVersion($DBversion) ) {
9763
if ( CheckVersion($DBversion) ) {
9764
    $dbh->do(q|
9764
    $dbh->do(q|
9765
        INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
9765
        INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
9766
        (20, 'shelves', 'Virtual shelves', 0)
9766
        (20, 'lists', 'Lists', 0)
9767
    |);
9767
    |);
9768
    $dbh->do(q|
9768
    $dbh->do(q|
9769
        INSERT INTO permissions (module_bit, code, description) VALUES
9769
        INSERT INTO permissions (module_bit, code, description) VALUES
9770
        (20, 'delete_shelves', 'Delete shelves')
9770
        (20, 'delete_public_lists', 'Delete public lists')
9771
    |);
9771
    |);
9772
    print "Upgrade to $DBversion done (Bug 13417: Add permission to delete shelves)\n";
9772
    print "Upgrade to $DBversion done (Bug 13417: Add permission to delete public lists)\n";
9773
    SetVersion ($DBversion);
9773
    SetVersion ($DBversion);
9774
}
9774
}
9775
9775
9776
- 

Return to bug 13417