[koha-commits] main Koha release repository branch master updated. v3.22.00-64-g83b7d6e

[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, master has been updated
       via  83b7d6e0d398407c9ca7333f68b78f7478600286 (commit)
      from  0ca5c7ea4f6abfef26f4b158da1ae76210728c6a (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 83b7d6e0d398407c9ca7333f68b78f7478600286
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Dec 4 18:49:39 2015 -0500

     Bug 15314: Use Bootstrap modal for cataloging merge MARC preview
    
    In order to reduce the number of dependencies for common interactions we
    should attempt to use Bootstrap modals in place of Greybox ones.
    
    This patch modifies the cataloging merge selection page so that the
    MARC preview is shown in a Boostrap modal. This patch also changes the
    preview link to be the text "View MARC" so that it is clear what it
    does.
    
    To test:
    
    1. Apply the patch and navigate to Cataloging.
    2. Perform a search which will return results from the catalog.
    3. Select two records and click the "Merge selected" button to begin the
       merge process.
    4. Test the "View MARC" link for both merge choices and confirm that the
       correct data is shown each time.
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Works as advertised
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

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

Summary of changes:
 .../prog/en/modules/cataloguing/merge.tt           |   33 ++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository