[koha-commits] main Koha release repository branch new/bug_6210 created. v3.06.00-458-g049ac6e

[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, new/bug_6210 has been created
        at  049ac6e2a7182a65cc83cea352ab377c3bec6924 (commit)

- Log -----------------------------------------------------------------
commit 049ac6e2a7182a65cc83cea352ab377c3bec6924
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jan 24 10:44:11 2012 -0500

    Bug 6210 - Follow up, Choose framework on merge
    
    - Adding subtitle to the display of titles to be merged
    - Adding a link to preview the MARC record of titles to be merged
    - Fixing up markup of form to improve appearance
    - Correcting breadcrumbs
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 91d870f67aa4b6a4784794e77304fcf759675184
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Mon Dec 19 19:22:49 2011 +1300

    bug_6210: Select framework if merging two records with different frameworks
    
    ModBiblio() - set framework to "" if "Default"
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    All 4 tests passed:
    
    Test 1:  Merge two records with the same framework
        Desired result:  shouldn't get any prompting to pick a framework, and the
    same framework should be used
    
        Test 2:  2 records, different frameworks, into the kept record's framework
        Desired result:  merge with kept records framework used
    
        Test 3:  2 records, different frameworks, into the discarded record's
    framework
        Desired result:  merge with used records framework used
    
        Test 4:  2 records, different frameworks, into a third framework
        Desired result:  merge with third framework used

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


hooks/post-receive
-- 
main Koha release repository