[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-53-gab9e44d

[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, 18.05.x has been updated
       via  ab9e44df31eadf09cefde0fee16f4a80e9c16049 (commit)
       via  a23f610fc2a8283b12cd8af4832dc34eb493004b (commit)
       via  41f1cf664337602f6543642236b913eafab02711 (commit)
       via  1107f15d9c2d2a4e7160f5cf5e3cb4a57c5dee7b (commit)
       via  59d59a990b0971ad932394bf8e3f8b93749168ca (commit)
      from  de5e943f4b13a5afa59da200ac913eba23ef7d52 (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 ab9e44df31eadf09cefde0fee16f4a80e9c16049
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Oct 18 18:00:15 2018 -0300

    Bug 21603: Remove incorrect GROUP BY from C4::CourseReserves
    
    'koha_kohadev.c.department' isn't in GROUP BY
    
    Test plan:
    Prove that the test fail without this patch and pass with this patch
    applied (switch on the SQL modes)
    
    Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 41397c855397aee9847943c2f124e0bdc8ba7eb7)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a23f610fc2a8283b12cd8af4832dc34eb493004b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Oct 18 17:37:35 2018 -0300

    Bug 21612: Remove incorrect GROUP BY's from Koha::VirtualShelves
    
    'koha_kohadev.me.shelfname' isn't in GROUP BY
    
    Same as
      commit 7e220e0d8f107cce63f32bfaa1919c04b4dea6e2
      Bug 20179: [sql_modes] Remove GROUP BY in get_shelves_containing_record
    
    Test plan:
    - Add public and privates shelves
    - Shares some of them
    - List them
    => The correct numbers of shelves must be displayed
    
    Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit b106ddb96b21a78559d7a60057e94024e7db4a16)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 41f1cf664337602f6543642236b913eafab02711
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 23 10:35:24 2018 -0300

    Bug 21635: [sql_modes] Remove GROUP BY clause in batchMod.pl
    
    batchMod.pl: DBD::mysql::st execute failed: 'koha_kohadev.authorised_values.authorised_val
    ue' isn't in GROUP BY [for Statement "SELECT authorised_value, lib FROM authorised_values LEFT JOIN authorised_values_branches ON ( id = av_id )  WHERE category = ? AND ( branchcode = ? OR branchcode IS NULL )
    GROUP BY lib ORDER BY lib, lib_opac" with ParamValues: 0='WITHDRAWN', 1="CPL"] at /home/vagrant/kohaclone/tools/batchMod.pl line 396.
    
    We must use Koha::AuthorisedValues->search instead of a raw SQL query.
    
    Test plan:
    Edit some items in a batch
    Confirm that the dropdown list (AV) are correctly filled
    
    We will lose speed efficiency here, but better to be consistent, then cache AV in Koha::AuthorisedValues
    
    Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit dab4426457578094eb5aac6531d1a1db631d05c7)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 1107f15d9c2d2a4e7160f5cf5e3cb4a57c5dee7b
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Oct 26 16:25:02 2018 +0000

    Bug 7143: Update about page for new devs Margaret Hade and Isobel Graham
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d71fb84f6fb40f7eb59a9f86f1a07d57f58f3c0a)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 59d59a990b0971ad932394bf8e3f8b93749168ca
Author: Isobel Graham <isobel.graham09 at gmail.com>
Date:   Sat Oct 20 09:12:19 2018 +0100

    Bug 20758: Fix for BrowseResultSelection typo
    
    To test:
    1) The  BrowseResultSelection description should no longer contain
    "fromt"
    
    Mentored-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d8edb017e4107802e55b5887a1454651565a2e49)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 C4/CourseReserves.pm                                  |    8 ++++----
 Koha/Virtualshelves.pm                                |    6 +++---
 docs/history.txt                                      |    3 +++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt      |    2 ++
 .../prog/en/modules/admin/preferences/searching.pref  |    2 +-
 t/db_dependent/CourseReserves.t                       |    5 ++++-
 tools/batchMod.pl                                     |   17 ++++++-----------
 7 files changed, 23 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
main Koha release repository