]> git.koha-community.org Git - koha.git/commit
bug_6210: Select framework if merging two records with different frameworks
authorSrdjan Jankovic <srdjan@catalyst.net.nz>
Mon, 19 Dec 2011 06:22:49 +0000 (19:22 +1300)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Mon, 20 Feb 2012 03:27:35 +0000 (22:27 -0500)
commitcc5a84def383029a56cbce71c93784f5ed0df54a
tree51700b01ad78aea4f908e3de4d818a3290c93a20
parentb95d437058e092af3c383b7286f3ed08a7dcc301
bug_6210: Select framework if merging two records with different frameworks

ModBiblio() - set framework to "" if "Default"

Signed-off-by: Nicole C. Engard <nengard@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
(cherry picked from commit 91d870f67aa4b6a4784794e77304fcf759675184)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9f99173ac4aa389ad969f5d8f444e992c4db68a5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
C4/Biblio.pm
cataloguing/merge.pl
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt