]> git.koha-community.org Git - koha.git/commit
Bug 9302: (QA follow-up) Consistency follow-up
authorTomas Cohen Arazi <tomascohen@theke.io>
Wed, 4 Apr 2018 19:56:34 +0000 (16:56 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 20 Apr 2018 16:34:41 +0000 (13:34 -0300)
commit253dbb758aca5e9554fd5d9afd4429224fedc859
tree2c0a5e433934595f9006faa27edec802d82d630c
parent73e7661c498ec110c35809491b29157567a775dc
Bug 9302: (QA follow-up) Consistency follow-up

This patch moves the Koha::Patrons->merge method into
Koha::Patron->merge_with in the line of the discussed implementation for
bug 15336. I agree with that implementation so I provide this follow-up.

Tests are adjusted, the controller script is adapted too. The behaviour
remains.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Koha/Patron.pm
Koha/Patrons.pm
koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
members/merge-patrons.pl
t/db_dependent/Koha/Patrons.t
t/db_dependent/Patrons.t