[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.03-60-g544c59c

[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, 3.18.x has been updated
       via  544c59cb22b12c914968fe9a69b49184be9fdcb7 (commit)
       via  41e419e3172497dd71b6de49d3996612d071191d (commit)
       via  e8c4bd8ab4e8986bfe2cfae58e9b14ac666bfe3f (commit)
      from  fa74808736d9aea8df6fff1bf9e146c62d95046c (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 544c59cb22b12c914968fe9a69b49184be9fdcb7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Nov 26 15:14:59 2014 +0100

    Bug 13343: Embed items when send a basket/shelf
    
    When a basket/shelf is downloaded, items are embedded, but not when
    sending it by email.
    
    We would expect to get the same file.
    
    Test plan:
    On Opac and intranet:
    1/ Add records with items to your basket and send it by email.
    Verify the file contains items.
    2/ Add records with items to a list and send it by email.
    Verify the file contains items.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a0e5d77a719443c6616194a898795f70d34d6ebc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 41e419e3172497dd71b6de49d3996612d071191d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Nov 25 10:16:47 2014 -0500

    Bug 13335 - Holds and priority display via OPACShowHoldQueueDetails confusing
    
    No matter what the selection of OPACShowHoldQueueDetails is, if it is
    enabled it displays a line "Holds and priority:" even if you've opted to
    hide one of those!
    
    Test Plan:
    1) Apply this patch
    2) Test each setting of OPACShowHoldQueueDetails
    3) Ensure each setting displays the correct fields ( or lack thereof )
    
    Signed-off-by: Christopher Brannon <cbrannon at debian.localdomain>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 295fb70f62069c0b1fbed2d9bbdf2650f58e488c)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit e8c4bd8ab4e8986bfe2cfae58e9b14ac666bfe3f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jan 28 08:31:30 2015 -0500

    Bug 13636 - Staff search results item status incorrect for holds
    
    Imagine this scenario: we have one record with four items. Two of those
    items are checked out, one of those items is a waiting hold, and one of
    those items is available. We would expect to see this on the search
    results page. Instead, we will see both non-checked out items as
    unavailable due to waiting holds.
    
    This is due to a semantic issue GetReserveStatus.
    C4::Search::searchResults uses GetReserveStatus to get the reserve
    status of each item, but unlike all other calls to the sub, this one
    passes in not only itemnumber, but biblionumber.
    
    When no reserve is found for the available item, the subroutine uses the
    biblionumber to grab what is essentially an arbitrary reserve to use for
    the status. This makes no sense and this functionality should be
    entirely removed from the subroutine so regressions like this will be
    prevented in the future.
    
    Test Plan:
    1) Create one record with 4 items
       a) check two of the items out to patrons
       b) set one of the items as a waiting hold
       c) leave the fourth item as available
    2) Run a search where this record will be in the results list
    3) Note that the results list 2 items on loan, two unavailable
    4) Apply this patch, reload the search results
    5) Note that the results list 1 available, 2 on loan, 1 unavailable
    
    Signed-off-by: John Andrews <jandrews at washoecounty.us>
    Signed-off-by: Sheila Kearns <sheila.kearns at state.vt.us>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Note: This is for the staff search result list!
    
    Works as expected.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit fcaa6f35c080c079ba422a70dec49ca327346c82)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 C4/Reserves.pm                                         |   12 +++---------
 C4/Search.pm                                           |    2 +-
 basket/sendbasket.pl                                   |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt     |   16 +++++++++++-----
 opac/opac-reserve.pl                                   |    2 --
 opac/opac-sendbasket.pl                                |    2 +-
 opac/opac-sendshelf.pl                                 |    2 +-
 virtualshelves/sendshelf.pl                            |    2 +-
 8 files changed, 19 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
main Koha release repository