[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.12-47-gbfc7877

Git repo owner gitmaster at git.koha-community.org
Thu Nov 29 13:39:19 CET 2018


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, 17.11.x has been updated
       via  bfc78771856c8ae074202922d3d9f7594cb2b514 (commit)
       via  e6c6dff9f93ae445a988f9b0899076372bcb3ed4 (commit)
       via  5b4e7813cd738477f7bdc35514b64582a8f12353 (commit)
       via  fb5bc3063718b782f5fe0d86b0772fab0c530270 (commit)
       via  636bd0f1959ee5ec183022cef7cf6fcd97eb270c (commit)
       via  76edb4d9ae346ecf398a7df7aec5e2cee18ee0d7 (commit)
       via  2f1b848a5e722d685aae4fdca4c5e530d072ce42 (commit)
      from  42f56d918aeecbc4bf830205f4ff91aa53ff53ae (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 bfc78771856c8ae074202922d3d9f7594cb2b514
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 25 15:24:29 2018 +0000

    Bug 21186: (follow-up) Incorrect Bootstrap modal event name in multiple templates
    
    This patch addresses a few more instances of this problem which I didn't
    catch in my first pass.
    
    To test, apply the patch and clear your browser cache if necessary.
    
    - Go to Circulation -> Check in and check in an item which has a hold.
      - When the 'Hold found' modal appears the checkin barcode field
        behind it should be disabled.
      - When the modal is dismissed the checkin field should be enabled
        again and focus should be on that field.
    
    - Go to Administration -> Library groups.
      - Click the "Add group" button. The cursor focus should be on the
        title field.
    
    - Go to Tools -> MARC modification templates.
      - Click the "New template" button. The cursor focus should be on the
        name field.
    
    Signed-off-by: Cori Lynn Arnold <carnold at dgiinc.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit b94399131614a304b3a0282ec8a85194cc72b3cf)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 5f7a2c92138ee44cf24d14cb52602bd490b89f2d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e6c6dff9f93ae445a988f9b0899076372bcb3ed4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Aug 8 19:03:38 2018 +0000

    Bug 21186: Incorrect Bootstrap modal event name in multiple templates
    
    Modals in the staff client which load data via AJAX require an "on
    close" action in order to clear the modal of the loaded data. The
    problem presents itself the second time the modal is opened: The
    "loading" message doesn't appear, and the data from the previous link
    is shown until the new data loads.
    
    To test, apply the patch and test the following pages. In each case,
    click multiple instances of the modal trigger link/button to confirm
    that the "loading" message always appears between re-displays of the
    modal.
    
    - Acquisitions -> Vendor -> Add to basket -> From a staged file -> Add orders
      - Test the "MARC" and "Card" links
    - Acquisitions -> EDIFACT messages
      - Test the "View message" button
    - Acquisitions -> Vendor -> Add to basket -> From an existing record
      - Test "View MARC" link
    - Acquisitions -> Vendor -> Invoices -> Invoice -> Receipt page
      - Test the "Order," "MARC," and "Card" links.
    - Catalog -> Bibliographic record details
      - Test the MARC Preview link.
    - Cataloging -> Cataloging search results
      - Test the Actions -> MARC preview and Actions -> Card preview menu
        items
    - Cataloging -> Cataloging search results -> Merge
      - Test the "View MARC" linkscataloguing/merge.tt
    - Tools -> Patron lists -> Actions -> Print patron cards
    - Tools -> Batch record modification -> Results -> Show MARC
    - Tools -> Staged MARC record management -> View batch
      - Test MARC preview shown when you click a staged title
    
    Signed-off-by: Cori Lynn Arnold <carnold at dgiinc.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7b6107beaf06d3e3956dc69145d966a35de1a59d)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 5d6eb1f67ba10edc83bd4b098ac5238dbfefe139)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5b4e7813cd738477f7bdc35514b64582a8f12353
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Fri Jun 29 09:23:38 2018 +0100

    Bug 20968: (follow-up) Replace tabs with spaces
    
    Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 9783773ada4dec115342a4f8f16b29eb5b98cc2f)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 6b4410d9673205e08cd58924a2ec04860b9f74d2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fb5bc3063718b782f5fe0d86b0772fab0c530270
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Wed Jun 27 13:21:53 2018 -0400

    Bug 20968: Rename method get_intranet_catalog_toolbar_button to intranet_catalog_biblio_enhancements_toolbar_button
    
    Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit e87fa069dc3d10284a2bd31b7c7913132fed5d06)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 2a899edbcc8c3739bd96bab9cfe06fbd8b1147a5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 636bd0f1959ee5ec183022cef7cf6fcd97eb270c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jun 27 17:13:37 2018 +0000

    Bug 20968: Add unit tests
    
    Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 60ca17c616e6026fbd271fb3f99473f3ef7edf00)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit db0c642d9b5c051b16a535882cea181f425860d2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 76edb4d9ae346ecf398a7df7aec5e2cee18ee0d7
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Wed Jun 27 17:13:27 2018 +0100

    Bug 20968: (follow-up) Respond to feedback
    
    This patch:
    
    - Removes the unecessary testing for
    intranet_catalog_biblio_enhancements method in detail.pl
    - Renames get_toolbar_button to get_intranet_catalog_toolbar_button
    
    Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7910a530b85b6ee42307d41cba57b95ced2aca27)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit cd3af66cd47c34bc01afa188ce879a4d3e2cc353)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2f1b848a5e722d685aae4fdca4c5e530d072ce42
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Wed Jun 20 12:47:10 2018 +0100

    Bug 20968: Add hooks into cat-toolbar.inc to display buttons
    
    This commit adds hooks into cat-toolbar.inc to allow the display of
    arbitrary buttons as supplied by plugins within the
    intranet_catalog_biblio_enhancements class that provide the method
    get_toolbar_button
    
    To test:
    
    1) Download the plugin from
    https://github.com/PTFS-Europe/cla-permissions-check-plugin
    2) Follow the installation instructions from:
    https://github.com/PTFS-Europe/cla-permissions-check-plugin
    3) TEST: Observe that the "CLA Check Permissions" button takes the user
    to the Check Permissions page and a modal displays containing the
    results of the query
    4) Remove the API key from the plugin "Configuration" page
    5) TEST: Ensure that the "CLA Check Permissions" button takes the user
    to the Check Permissions page and message displays informing the user
    that "Did not receive required request parameters"
    
    https://bugs.koha-community.org/show_bug.cgi?id=20968
    
    Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 741f17e916a3f64d71b55fd87065136307e3bae7)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 2c7724f3bf10949454d4fe09702c0366ae41ad8d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 catalogue/detail.pl                                |   64 ++++++++++++--------
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    4 ++
 .../prog/en/modules/acqui/addorderiso2709.tt       |    2 +-
 .../prog/en/modules/acqui/edifactmsgs.tt           |    2 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    2 +-
 .../prog/en/modules/catalogue/detail.tt            |    2 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |    2 +-
 .../prog/en/modules/cataloguing/merge.tt           |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    4 +-
 .../prog/en/modules/patron_lists/lists.tt          |    2 +-
 .../prog/en/modules/plugins/plugins-home.tt        |    3 +
 .../en/modules/tools/batch_record_modification.tt  |    2 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    2 +-
 .../prog/js/marc_modification_templates.js         |    2 +-
 t/db_dependent/Plugins.t                           |    4 +-
 t/lib/Koha/Plugin/Test.pm                          |   10 +++
 17 files changed, 72 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list