[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.10-49-g9aea6d9

[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, 3.20.x has been updated
       via  9aea6d98ab95b0b5d7b8d97f5d726f30737a6483 (commit)
       via  c7a9da21172e2cb1af90a914109870c85515c1b4 (commit)
      from  af63ab0687699808e4069ebafa1adbec268c1be5 (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 9aea6d98ab95b0b5d7b8d97f5d726f30737a6483
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 3 08:58:33 2016 +0100

    Bug 16426: follow-up of bug 15840 - correctly manage userid while inserting patrons
    
    Bug 15840 tried to fix a bug but makes things more complicated than it
    was before.
    If an userid is not provided for 1 or more rows of the csv file, it
    should not be updated. However, if a userid is provided and it already
    used by an other patron, the import should fail for this row (but not
    crash!).
    
    Test plan:
    0/ Create a patron with a userid=your_userid
    1/ Use the import patron tool to update this userid
    => userid should have been updated
    2/ Update another data and do not provide the userid
    => data should have been updated and not the userid
    3/ Update another data and provide the userid, but set it to an empty
    string, or '0'
    => data should have been updated and not the userid
    4/ Update another patron, and set userid=your_userid
    => Update should fail and an error whouls be displayed ("already used by
    another patron")
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit 7b76b24fad305b0253eb1d779f074d265087ca73)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit b53075b58df01e65371e13dee0b6848d12a181f2)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c7a9da21172e2cb1af90a914109870c85515c1b4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 3 08:58:26 2016 +0100

    Bug 16426: Add tests for ModMember - do not update userid
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit e883c19f3778c0247c11e6bdd3f27bbdd927468d)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit ea45e3f39ebdd2a33b7ea00730ef278ba0f461a7)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Members.pm                                        |    3 +++
 .../prog/en/modules/tools/import_borrowers.tt        |    2 +-
 t/db_dependent/Members.t                             |   15 ++++++++++++++-
 tools/import_borrowers.pl                            |   18 ++++++++++--------
 4 files changed, 28 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository