[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.11-7-g5d5e187

[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  5d5e187cf057bf6c175864a15281f776a884033c (commit)
       via  4d243109b3906eccc3c741560a8019a73f11f3a9 (commit)
       via  359dac4781cdd47f47b3148815b274d22f1f38f4 (commit)
      from  fda6ea7c322fccf79b07bec04d68c9c79a8a382d (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 5d5e187cf057bf6c175864a15281f776a884033c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Aug 26 11:42:14 2015 -0400

    Bug 14733: Unit Tests
    
    Signed-off-by: Heather Braum <hbraum at nekls.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Conflicts:
    	t/db_dependent/Holds.t
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 4d243109b3906eccc3c741560a8019a73f11f3a9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 21 16:46:00 2015 +0100

    Bug 14733: Replace 'priority' with 'estimated priority'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 8ef69e473b1f1a0daac559bf19818fd04b2c5313)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 359dac4781cdd47f47b3148815b274d22f1f38f4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Aug 26 11:43:08 2015 -0400

    Bug 14733: Prevent a record from having holds with duplicate priorities
    
    It is possible to create holds with duplicate priorities.
    
    The reason for this is that typically the priority is calculated before
    placing the hold. When the hold is placed the priority is calculated.
    This can easily be shown by opening up two browser windows and starting
    to place a hold for a record in each one. You'll see that both list the
    same priority. If you than place the hold in each window, both holds
    will have the same priority!
    
    Test Plan:
    1) Run unit tests pre-patch, note they fail
    2) Run unit tests post-patch, note they succeed
    
    Signed-off-by: Heather Braum <hbraum at nekls.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 37ad2d78679fc8487811ff9cd1679eecac30faa5)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Reserves.pm                                             |    2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt |    2 +-
 t/db_dependent/Holds.t                                     |   10 +++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository