[koha-commits] main Koha release repository branch master updated. v3.14.00-765-gdc6d8a2

Fri Apr 18 22:25:45 CEST 2014

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  dc6d8a2199f79e36839a2769994883e04b61cb67 (commit)
       via  be3ce1e7a2477b02d4c071543405898c21380926 (commit)
       via  4d78b9588a9f5fc68142b9d1556686072e7b5dba (commit)
       via  4f7803e469a41cafb993c6d41e6481499e6cca93 (commit)
       via  b772969cddce53d72bfd27bfda0ee094b1332e9d (commit)
       via  f0e574be4a834b28b0e19f2964f5de989f0e6665 (commit)
       via  214d6b8d13c553027c868a00a2dd6b313f56608b (commit)
       via  9af0aa288c23a6722333adebba7b8b3e12ed78e2 (commit)
      from  b8f1b43966d178174583c7a3e0c36e58f988b161 (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 dc6d8a2199f79e36839a2769994883e04b61cb67
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Apr 18 20:47:48 2014 +0000

    Bug 12098: (follow-up) put can_show_subscription() into use

    This patch puts C4::Serials::can_show_subscription() into use.

    Note that there is user-visible change: if a subscription has a
    blank library, all users with serials permissions will be able
    to view and/or edit it.  It remains to be determined whether
    we *want* such subscriptions to exist, or if they should only
    be tied to specific libraries.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit be3ce1e7a2477b02d4c071543405898c21380926
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Apr 18 20:17:27 2014 +0000

    Bug 12098: (follow-up) deal with FIXMEs in t/db_dependent/Serials_2.t

    This patch nails down the number of tests to be run.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4d78b9588a9f5fc68142b9d1556686072e7b5dba
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 16 16:58:36 2014 +0200

    Bug 12098: Refactor can_*_subscription in C4::Serials

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Tested on top of patches for 12048 and 12080.

    Subscription search
    - superlibrarian, IndyBranches on/off - always sees all subscriptions
    - superserials, IndyBranches on/off - always sees all subscriptions
    - no superserials, IndyBranches on - only sees own subscriptions
    Note: Subscriptions without branches will only show, when all subscriptions
          are visible. In a future enh it might be good to enforce setting a
          branch, when IndyBranches is used.
    - no superserials, IndyBranches off - always sees all subscriptions

    Subscription editing
    - superlibrarian, IndyBranches on/off - can edit all subscriptions
    - superserials, IndyBranches on/off - can edit all subscriptions
    - no superserials, IndyBranches on - can only edit own subscriptons and
      subscriptions without branch
      NOTE: it would make sense to also allow Edit > Edit as new (duplicate)
      here, so one can copy the subscription from another branch to modify
      it for the own branch.

    Passes tests in t, xt and QA script, also newly provided unit tests.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4f7803e469a41cafb993c6d41e6481499e6cca93
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 16 16:50:23 2014 +0200

    Bug 12098: Fix C4::Serials::can_edit_subscription

    This patch fixes a problem whereby staff users could
    edit subscriptions they are not permitted to by going directly
    to the subscription details page.

    It also adds some unit tests for the can_edit_subscription routine
    and add a new can_show_subscription routines.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Notes on second patch.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit b772969cddce53d72bfd27bfda0ee094b1332e9d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Apr 18 08:27:35 2014 -0400

    Bug 12080: (follow-up) fix test failure and warnings in Bookseller.t

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixes the tests as promised.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit f0e574be4a834b28b0e19f2964f5de989f0e6665
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Tue Apr 15 10:10:07 2014 +0200

    Bug 12080: restore effect of superserials permission

    The superserials permission is meant to allow an operator
    to see all subscriptions regardless of branch when IndependentBranches
    is on without having to have full superlibrarian permissions.  This
    patch restores this behavior.

    TEST PLAN
    ---------
    1) Apply the patch for bug 12048 (as needed -- it may be pushed)
    2) Ensure you have two users: superlibrarian, non-superlibrarian
       with all access to the staff client except superserials.
    3) Ensure you have serials belonging to a different branch than
       the non-superlibrarian.
    3) Log into staff client as superlibrarian
    4) Click 'Serials'
    5) Click the 'Submit' button in the search area.
       -- note the number of results.
    6) Log into staff client as non-superlibrarian
    7) Click 'Serials'
    8) Click the 'Submit' button in the search area.
       -- note the number should be less, note the number.
    9) Give the non-superlibrarian superserials access.
    10) Home -> Serials
    11) Click the 'Submit' button in the search area.
       -- the number will still be the same at the one in step #8.
    12) Apply the patch
    13) Refresh the page
       -- the number should now match the one in step #5.

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 214d6b8d13c553027c868a00a2dd6b313f56608b
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Tue Apr 8 17:26:18 2014 +0200

    Bug 12048: restore ability of superlibrarian to see other libraries' subscriptions

    This patch fixes a regression in master and 3.14. When a user has
    superlibrian permissions, a search on serials subscriptions should
    display other libraries' subscriptions even when IndependentBranches
    syspref is enabled.

    To reproduce/test the bug/patch:

    1. Enable IndependentBranches (i.e. 'Prevent' staff...)
    2. Login as a user not having superlibrarian permission
    3. Search for a serial subscription on:
       /cgi-bin/koha/serials/serials-search.pl
    4. Search a title which has at least 2 subscriptions: one in the user
       branch, and one in another branch
    5. On the result page, just 1 subscription is displayed: the one
       attached to the userbranch
       => this is normal
    6. Login as a user having superlibrarian permission
    7. Repeat step 3-5.
    8. You get the same result as 5. You should have seen all subscriptions.
       That's what you get after applying this patch.

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    NOTE: I tested a variation. My superlibrarian was a branch that
          was not the same as the non-superlibrarian. The serial was
          the same branch as the non-superlibrarian. Without the
          patch, the superlibrarian saw nothing, with the patch it
          saw the serial as expected.
          Also, remember the superserials permission can affect the
          results. I successfully changed the branch of the
          subscription, and then it ceased to show up with
          superserials not granted to the non-superlibrarian.
          I corrected the system preference name in the text here.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Superlibrarian permission now allows to see all subscriptions
    independent from the branch.
    Passes all tests and QA script.

    But the superserials permission appears broken to me before
    and after this patch. If I have superserials - the search
    doesn't show all subscriptions. If I don't have superserials
    I can still edit any subscription accessing the subscription
    detail page through the serial collection page or accessing
    the detail page directly by manipulating the URL.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 9af0aa288c23a6722333adebba7b8b3e12ed78e2
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Apr 18 19:56:51 2014 +0000

    Bug 12048: add regression test

    This patch adds a regression test for verifying that superlibrarians
    can see all subscription when IndependentBranches is on.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Serials.pm               |   67 +++++++++----
 t/db_dependent/Bookseller.t |   50 +++++++++-
 t/db_dependent/Serials_2.t  |  219 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 290 insertions(+), 46 deletions(-)

hooks/post-receive
-- 
main Koha release repository