[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.07-21-gd618757

Git repo owner gitmaster at git.koha-community.org
Tue Dec 3 20:04:41 CET 2013


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.12.x has been updated
       via  d6187576829c2d7d535b13a0d73e4de7a4c9b267 (commit)
       via  883e5876a4d34ec7968ee7745cfa72a21a86f1ea (commit)
       via  cf1ea2081644e36aea74b48effe29b00f77daf71 (commit)
       via  9a807414d448c9beb9794ad9c0409d67eea9229f (commit)
       via  58d58510d04c58a9b918838d96e1562be16f81ea (commit)
       via  9ffad2ccda0a4e704f33539356f1cb207c0232cc (commit)
      from  9fd59ed985b0fac6dfff3fddaad8bf247579587c (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 d6187576829c2d7d535b13a0d73e4de7a4c9b267
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Oct 18 07:25:29 2013 +0000

    Bug 8368: (follow-up) restore use of quoted printable for message body
    
    This is necessary to prevent the equals sign that is part of the
    link back to the OPAC from being mangled, thereby breaking the
    link.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 51a6f0958926fcbdf48e97d386a2463a9c113d73)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 883e5876a4d34ec7968ee7745cfa72a21a86f1ea
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Oct 18 06:47:39 2013 +0000

    Bug 8368: (follow-up) port change to the Bootstrap OPAC; restore ISBN display
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 745bcfe0a6066a552d53d813ed4aed625c7e52b4)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Kept the ISBN fix back, dropped the bootstrap bits.
    
    Conflicts:
    	koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt

commit cf1ea2081644e36aea74b48effe29b00f77daf71
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Tue Sep 24 18:34:48 2013 +0200

    Bug 8368: fix email lists from OPAC when using non-English templates
    
    This patch ports to list sending by email, the technique used in sending
    cart, i.e. (1) format email in HTML, and (2) transform it into Text with
    TT filter html2text.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixes a very annoying translation bug successfully.
    Also passes all tests and QA script.
    
    To test:
    - Add a few records to a shelf, ideally use some with diacritics.
    - Send shelf from English templates, verify email is ok
    - Send shelf from translated templates (de-DE or similar) - verify
      email content is broken.
    - Apply patches, update po files and reinstall the language.
    - Send shelf from English templates again, verify there is no
      regression.
    - Send shelf form translates templates - verify this email is now
      also working correctly.
    
    Patch also changes the name of the file attachement from shelf.iso2709
    to list.iso2709.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit bbcc715c9435fc82fd6179722332128e4e5c6ee5)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 9a807414d448c9beb9794ad9c0409d67eea9229f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Sep 9 14:12:05 2013 +0200

    Bug 10843: fix crash that can occur when confirming hold if ReservesMaxPickUpDelay is undefined
    
    Test plan:
    1) set an empty string for the ReservesMaxPickUpDelay pref
    2) place a hold on an item
    3) check in the item
    4) click on "Print and confirm"
    5) an error occurs
    > The 'days' parameter (undef) to DateTime::Duration::new was an 'undef'
    6) apply the patch
    7) repeat steps 1 to 4
    8) the error does not occur anymore.
    
    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    An empty string didn't do it for me, I had to set the
    variable for the systempreference to NULL. I am not sure
    if this can happen when editing from the interface, but
    this change should not have any ill side effects and it has
    unit tests!
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit a9b564678e184b44b4c54d72e21f66efc3810f4e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Adjusted some bits.

commit 58d58510d04c58a9b918838d96e1562be16f81ea
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue May 21 17:13:35 2013 +0200

    Bug 10298: Mock C4::Context->preference
    
    t::lib::Mocks::Context tried to deal with preferences but did not manage
    to.
    
    This patch removes this module and add 2 routines in t::lib::Mocks in
    order to mock C4::context->preference and C4::Context->config.
    
    To test:
    
    ===START t/test.pl===
    
    use Modern::Perl;
    use t::lib::Mocks;
    use C4::Context;
    
    say "initial value for version: " . C4::Context->preference('Version');
    say "initial value for language: " . C4::Context->preference('language');
    t::lib::Mocks::mock_preference('Version', "new version for testing");
    say "version is mocked with: " . C4::Context->preference('Version');
    say "language is not yet mocked: " . C4::Context->preference('language');
    t::lib::Mocks::mock_preference('language', 'new langage for testing');
    t::lib::Mocks::mock_preference('Version', 'another version for testing');
    say "version is mocked with another value: " . C4::Context->preference('Version');
    say "language is finally mocked: " . C4::Context->preference('language');
    ===END===
    
    Try to execute this file and check that the output is consistent.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit eb90241c7941760a79c48c745c8fd938780490a8)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 9ffad2ccda0a4e704f33539356f1cb207c0232cc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri May 24 13:32:24 2013 +0200

    Bug 10298: Followup: Adapt existing code
    
    This unit tests file does not need the t::lib::Mocks::Context module.
    
    To test:
    
    prove t/db_dependent/Circulation_issuingrules.t
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, test checks out.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit a765d5f88e125e0f43e2e5cfe766bc22f0fd0d08)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Letters.pm                                      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-sendshelf.tt    |  187 ++++++++++++++++----
 opac/opac-sendshelf.pl                             |   31 ++--
 t/Letters.t                                        |   18 +-
 t/db_dependent/Circulation_issuingrules.t          |    1 -
 t/lib/Mocks.pm                                     |   46 +++--
 t/lib/Mocks/Context.pm                             |   13 --
 7 files changed, 214 insertions(+), 84 deletions(-)
 delete mode 100644 t/lib/Mocks/Context.pm


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list