[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-3-g0b663b6

Mon May 9 09:53:47 CEST 2016

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, 3.22.x has been updated
       via  0b663b64449b402330229c975e38aa164eeeccee (commit)
      from  a5480957e1741e9d1885772a79427170df3e4498 (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 0b663b64449b402330229c975e38aa164eeeccee
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date:   Thu Apr 28 09:35:51 2016 +0200

    Bug 16373: merge.pl reports success but files are not merged

    To recreate:

    1) Select two biblios to merge
    2) Merge them
    3) Sucess reported but list of bibs contains only the reference record.
    4) View the 'new' record, it won't have any additional items
    5) View the 'merged' record, it is still there with its items

    This happens because record IDs (biblionumbers) are not correctly
    set up in the template on the 2nd merge stage, since Bug 15358.

    To test:

    1) apply patch
    2) try to recreate this issue once again, confirm that a problem
    is resolved

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit 404d9001febc47f53a89be349abd8628d75dd8f6)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

hooks/post-receive
-- 
main Koha release repository