[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.12-11-g80d6f2c

[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.11.x has been updated
       via  80d6f2cc6d138b8e09b895fbdde256344308e960 (commit)
       via  7523e7f7fc033045f29fba24eed0f9b53bf09599 (commit)
      from  f1c2ed41491a334c3029f5f2079ea41127263669 (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 80d6f2cc6d138b8e09b895fbdde256344308e960
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Dec 5 13:19:20 2019 +0100

    Bug 21270: Display "Make an Interlibrary loan request" even if "suggestions" is turned off
    
    Test plan:
    - Turn off "suggestions"
    - Turn on "ILLModule"
    => When logged in you should see the "Make an Interlibrary loan request"
    
    - Turn on "suggestions"
    - Turn off "ILLModule"
    => When logged in you should see the "Make a purchase suggestion"
    
    - Turn on "suggestions"
    - Turn on "ILLModule"
    => When logged in you should see both links.
    
    - Turn off "suggestions"
    - Turn off "ILLModule"
    => You should not see the "Not finding what you're looking for?" block
    
    - Turn on "suggestions"
    - Turn on AnonSuggestions
    => You should see the "Make a purchase suggestion" even when logged out
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 0e1d6ffcf7fac1894abc097fa37f2704b22ca4d9)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 391378996527cecd01e2367b15833c3872a69f3b)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

commit 7523e7f7fc033045f29fba24eed0f9b53bf09599
Author: Blou <philippe.blouin at inlibro.com>
Date:   Fri Aug 24 11:46:54 2018 -0400

    Bug 21270: "Not finding what you're looking for" displaying uselessly
    
    When doing OPAC search, at the bottom you have an offer presented with "Not finding what you're looking for" to introduce Suggestions or ILL if enabled.
    
    Bug 7317 modified the if-else and now if you enable ILLModule but not AnonSuggestions and are not logged, you have this little string sitting there, offering nothing to the user.
    
    Just taunting them...
    
    TEST:
    0) Set IllModule to true, AnonSuggestions to false.
    1) Without login, just to an OPAC search.  At the bottom will be a nice string laughing at your failed search
    2) Apply the patch.
    3) Problem at 1) is fixed.
    4) Login to validate that ILL link now appear.
    5) Modify combination of IllModule and AnonSuggestions to validate links appearing.
    
    Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
    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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 489cfb4b19b72dc1b156b0a4fa38add79ee3f05b)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit c3c0a1228f134df0a5bc0a2f692310c3451a88b8)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository