[koha-commits] main Koha release repository branch master updated. v16.05.00-1426-gd9be995

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d9be9950b3d59f43d997ca9ead5860fba0274fe0 (commit)
       via  9ca72539de083c9a62f16b2f114b9111a0f06636 (commit)
      from  a0416ff132469e6816554136707e398f114ab13e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d9be9950b3d59f43d997ca9ead5860fba0274fe0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Nov 21 16:34:46 2016 +0000

    Bug 17663 - DBRev 16.06.00.048
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 9ca72539de083c9a62f16b2f114b9111a0f06636
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sun Nov 20 16:35:53 2016 +0100

    Bug 17663: Forgotten userpermissions from bug 14686
    
    Bug 14686 added in a dbrev:
        (13, 'upload_general_files', 'Upload any file'),
        (13, 'upload_manage', 'Manage uploaded files');
    
    But these were not added in userpermissions.sql somehow :)
    So, what now?
    
    This patch:
    [1] adds them to userpermissions.sql as should have been done,
    [2] adds a dbrev to add them for newer installs that did not run the
        14686 dbrev.
    
    Test plan:
    [1] Run this sql statement:
        DELETE FROM permissions WHERE code = 'upload_general_files' OR
            code = 'upload_manage'
    [2] Run the db rev.
    [3] Check if you see Tools/Upload (with sufficient perms).
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 Koha.pm                                  |    2 +-
 installer/data/mysql/updatedatabase.pl   |   27 +++++++++++++++++++++++++++
 installer/data/mysql/userpermissions.sql |    2 ++
 3 files changed, 30 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository