[koha-commits] main Koha release repository branch master updated. v3.22.00-1301-g19d2dfb

Wed Apr 27 18:15:30 CEST 2016

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  19d2dfb733b0ec6b66228462678d016891334138 (commit)
       via  2c385d0d7dfe0398e8f5ebb90a600f1d8925e420 (commit)
       via  220a517c8ed79b68312c1dc94a3a893e21c590aa (commit)
       via  9eb80092e3aeae8292dee9a3cb3e7345c9adefc2 (commit)
       via  49a3b581b7d68251a0bf76aaf84b0565a6226fce (commit)
       via  b69402d14cd83ebedfd1272f9a42c4ceacfa60db (commit)
      from  a25bfbfc574ac41a8a570a9a9b01716291d5a0dc (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 19d2dfb733b0ec6b66228462678d016891334138
Author: Brendan Gallagher <bredan at bywatersolutions.com>
Date:   Wed Apr 27 16:24:18 2016 +0000

    DBRev for Bug 14686 - New menu option and permission for file uploading

    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>

commit 2c385d0d7dfe0398e8f5ebb90a600f1d8925e420
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Apr 4 14:21:08 2016 +0100

    Bug 14686: Remove unused use

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>

commit 220a517c8ed79b68312c1dc94a3a893e21c590aa
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Apr 1 11:14:15 2016 +0200

    Bug 14686: [QA Follow-up] Move allows_add_by to Upload.pm

    As requested by QA, the sub should be moved.

    Test plan:
    See previous patches.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>

commit 9eb80092e3aeae8292dee9a3cb3e7345c9adefc2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Feb 8 10:26:58 2016 +0100

    Bug 14686: Add Upload to Tools menu

    This patch makes sure that the added granular permissions work as
    advertised.

    Note: The field owner was not included in the Koha::Upload->get response.
    The code to verify if a user is allowed to delete an upload, is concentrated
    in the template now. When get returns a Koha::Object, this check could be
    relocated.

    Test plan:
    [1] Verify that the current user has permission for tools, or has
        at least upload_general_files.
    [2] Do you see Upload in the Tools menu? Follow the link.
    [3] Upload a permanent file (with a category).
    [4] Do you see the Delete button in the results form?
    [5] Make sure that another user has no permission to upload.
    [6] Login as that user and check the Tools menu.
        Try the URL [yourserver]/cgi-bin/koha/tools/upload.pl
        You should have no access to the upload form.
    [7] Enable upload_general_files for this user. Go to upload and search for
        the upload from step 3. You should not see a Delete button.
    [8] Enable upload_manage for this user. Search for the upload again.
        Delete the upload.
    [9] Go to upload via the Cataloguing editor (856$u plugin) or add
        parameter "plugin=1" to the URL. You should not see the Tools menu.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>

commit 49a3b581b7d68251a0bf76aaf84b0565a6226fce
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Mar 14 13:42:10 2016 +0100

    Bug 14686: Add two granular permission for upload under tools

    [1] Upload_general_files
        This will allow you to access the tools/upload form via the Tools menu.
        And it will also allow you to add permanent uploads.

    [2] Upload_manage
        It will allow you to delete uploads from other users.
        Note that anyone may delete his own uploads.
        It is not meant to include upload_general_files.

    In order to not disturb existing users that now have edit_catalogue and are
    using the plugin (read: added at least one record to uploaded_files), we
    will add the first permission for them. New users will need to be authorized
    in the usual way thereafter.

    Note: If you only have one of the other permissions checked in allows_add_by,
    e.g. stage_marc_import, you can add temporary uploads, but not permanent
    uploads.

    Test plan:
    We are only testing the dbrev here, not if the perm works as advertised.
    [1] Run the dbrev and check that you see the perms with a description on
        the Patron/Set permissions page.
    [2] If you had records in uploaded_files and a user with edit_catalogue
        *only*, verify that this user now also has upload_general_files.

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>

commit b69402d14cd83ebedfd1272f9a42c4ceacfa60db
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Mar 14 13:22:14 2016 +0100

    Bug 14686: Add allows_add_by to check permissions for uploading

    The three permissions in tools/upload-file.pl are moved to a custom
    routine in DBIx's UploadedFile.pm. An additional granular permission
    upload_general_files is added. (The dbrev patch will contain it too.)
    At some point in time this could be moved to a Koha::Object class.

    The routine is tested in Upload.t.

    Test plan:
    [1] Run t/db_dependent/Upload.t
    [2] If you only apply this patch, you can also test uploading with a
        user that has edit_catalogue but does not have tools or circulate.
        Upload status should say: Denied.

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Brendan Gallagher <bredan at bywatersolutions.com>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 Koha/Upload.pm                                     |   25 +++++++++-
 installer/data/mysql/updatedatabase.pl             |   29 +++++++++++
 .../intranet-tmpl/prog/en/includes/permissions.inc |    2 +
 .../intranet-tmpl/prog/en/includes/tools-menu.inc  |    3 ++
 .../prog/en/modules/tools/tools-home.tt            |    5 ++
 .../intranet-tmpl/prog/en/modules/tools/upload.tt  |   13 +++--
 t/db_dependent/Upload.t                            |   51 ++++++++++++++++++--
 tools/upload-file.pl                               |   16 +-----
 tools/upload.pl                                    |   11 +++--
 10 files changed, 129 insertions(+), 28 deletions(-)

hooks/post-receive
-- 
main Koha release repository