[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-25-g625c220

[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  625c2201f03ba0084005a3d230dca6460eadfa3b (commit)
      from  676521157970f50914ccb1ea47122ac2ce9d916d (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 625c2201f03ba0084005a3d230dca6460eadfa3b
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date:   Thu Mar 7 02:50:12 2019 +0000

    Bug 21003: Removed warning and changed wording on add_items-step2.tt
    
    When editing an item in a Course Reserve, the page displayed is the same
    that is displayed when adding an item to a Course Reserve. This patch
    removes the warning 'This course already has this item on reserve' when
    the item is being edited, as well as changes the title, breadcrumbs, and
    header of the div. This patch also Changes the header of the div to say
    'Edit 'book_name' in 'course_name'' instead of 'Add 'book_name' to
    'course_name'' when adding items to a course reserve if the item is
    already present.
    
    To test:
    1) Create a new course in Course Reserves (you will need Course
        Reserves enabled in syspref)
    2) Add an item by clicking the Add reserves button
    3) Click the edit button on the right hand side of the item listing
    under the Reserves heading
    4) Observe that the warning 'The course already has this item on reserve' appears, and that the title, breadcrumbs and
    header of the div all say Add/Reserve
    5) Apply the patch
    6) Repeat step 3 and observe that the title, breadcrumbs and header of
    the div now say Edit
    7) Also verify that when adding a reserve with a barcode that does not
    yet exist in the course reserves that the warning 'The course already...' is not displayed and that the header of the div says Add
    8) Finally verify that when adding a reserve with a barcode that DOES
    exist in the course reserves that the warning 'The course already...' IS
    displayed and the header of the div says Edit
    9) Sign off!
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 3eee6f3091fcb621152af7f4db6441c98cb74558)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 7c39ad305da2c337743fc5122c5a7b5220dea98f)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 course_reserves/add_items.pl                             |    2 ++
 .../prog/en/modules/course_reserves/add_items-step2.tt   |   14 +++++++++-----
 .../prog/en/modules/course_reserves/course-details.tt    |    2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository