[koha-commits] main Koha release repository branch master updated. v3.18.00-beta-117-g3b6b8a4

Git repo owner gitmaster at git.koha-community.org
Thu Nov 27 15:39:21 CET 2014


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, master has been updated
       via  3b6b8a4a1e59c773bd3feaa94b1139c2ccdfbbd4 (commit)
       via  eff8f8c0d0ce3843b215c9e501d926be93eac597 (commit)
       via  a5998603f346543480220bb1f2b4bcdc9044a883 (commit)
       via  ab4bb0fe5e9d0e28b47020c1b4af330d1b548204 (commit)
       via  6f599652b1ccfb3f7647a63ca230b97db3495b69 (commit)
       via  2973e20c1f7b4fca8cd59000e3550e5132676289 (commit)
      from  639a2aa10f42843f640018219b982894596dd0c9 (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 3b6b8a4a1e59c773bd3feaa94b1139c2ccdfbbd4
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Nov 25 15:34:33 2014 +0100

    Bug 13215: Fix GetLetterTemplates should return default templates if branchcode is not defined
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit eff8f8c0d0ce3843b215c9e501d926be93eac597
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Nov 21 16:13:41 2014 +0100

    Bug 13215: (follow-up) Fix notice edition
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit a5998603f346543480220bb1f2b4bcdc9044a883
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Nov 21 10:28:02 2014 +0100

    Bug 13215: Fix notice deletion
    
    This patch could have only been
    -        name => $values[0]->{name},
    +        name => $letter->{name},
    
    Other changes are just indentation and variable names (send an hashref
    $letter to the template and use the Branches TT plugin to display the
    branch name)
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit ab4bb0fe5e9d0e28b47020c1b4af330d1b548204
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Nov 21 10:24:07 2014 +0100

    Bug 13215: Fix notice edition
    
    C4::Letters::getletter does not set mtt in value ( i.e. { email => "my
    email notice} ) at the contrary of the get_letter routine defined in
    tools/letters.pl.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 6f599652b1ccfb3f7647a63ca230b97db3495b69
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Nov 6 16:02:08 2014 +0100

    Bug 13215: The same letter code can be used for several libraries
    
    This patch fixes a major issue introduced by the
    commit 5c4fdcf Bug 11742: A letter code should be unique.
    
    The interface should let the possibility to create a default template
    letter and some specific ones, with the same letter code (letter.code).
    
    The patches submitted on bug 11742 tried to fix an issue based on a
    (very bad) assumption: letter.code should be considered as a primary key and
    should be uniq.
    
    This patch reintroduces this behavior.
    Note that the interface will block a letter code used in different
    module (this is consistent not to have the same letter code used for different
    needs).
    
    This patch is absolutely not perfect, it just tries to change as less
    change as possible and to use new tested subroutines.
    
    Test plan:
    1/ Verify that the problem raised on bug 11742 does not appears anymore.
    2/ Verify there are no regression on adding, editing, copying, deleting
    letters.
    3/ Verify you are allowed to create a default letter template with a letter
    code and to reuse for a specific letter (i.e. for a given library).
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 2973e20c1f7b4fca8cd59000e3550e5132676289
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Oct 7 09:35:19 2014 +1300

    Bug 12856: koha-disable fails without disabling site
    
    To test:
    Package up a branch with this patch
    install that package
    create a site - sudo koha-create --create-db testdisable
    enable a site - sudo koha-enable testdisable
    check it's enabled - sudo koha-list --enabled
    * it should show up
    disable a site - sudo koha-disable testdisable
    Do this for both debian squeeze/wheezy and ubuntu 12.04 and 14.04, if you can. I'd like to see a sign off from a debian (sq/wh)eez(e/y) or ubuntu 12 user, because I could only test reliably on ubuntu 14.04.
    * make sure apache restarts and no errors are produced
    check it's disabled - sudo koha-list --enabled
    * it should not show up
    check the site is still there - sudo koha-list
    * it should still be there
    check that the config file has the Include for disabling uncommented
    * the line Include /etc/koha/apache-shared-disable.conf should not have a # in front.
    Re-enable the site - sudo koha-enable testdisable
    * the line Include /etc/koha/apache-shared-disable.conf should have a # in front.
    
    And the final question - does the site work? All other functions unchanged?
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Works as expected. code reads better too.
    Edit: I added a missing space in one line.

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

Summary of changes:
 C4/Letters.pm                                      |  141 +++++++++++++-
 debian/scripts/koha-disable                        |   20 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |   94 +++++-----
 svc/letters                                        |    2 +-
 t/db_dependent/Letters/GetLetterTemplates.t        |  130 +++++++++++++
 .../Letters/GetLettersAvailableForALibrary.t       |  195 ++++++++++++++++++++
 tools/letter.pl                                    |   71 +++----
 tools/overduerules.pl                              |    7 +-
 8 files changed, 554 insertions(+), 106 deletions(-)
 create mode 100644 t/db_dependent/Letters/GetLetterTemplates.t
 create mode 100644 t/db_dependent/Letters/GetLettersAvailableForALibrary.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list