[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.04-47-gb4d77d7

Fri Mar 13 23:46:34 CET 2015

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.18.x has been updated
       via  b4d77d7c78c847a6e4fc62e36a80a3a1ad688058 (commit)
       via  f8ee8c5006d6f9656ceb5402dda0fe13d3aa65a3 (commit)
       via  a46c2d21166865079f7f054fae296044bbdc1e31 (commit)
       via  778ae6a30d565fe8da1b71a4410d21dad2a55637 (commit)
       via  02521f7ed2633816fc84c184fb2535500087721d (commit)
       via  6420117ecdc6a575d88ea7d47eff7204ee50cf87 (commit)
       via  10084d00ac7bc35b6af0fb233d73a633cd714a76 (commit)
       via  66afc74c05c5c315591d8de84b18828eb5d6f9b7 (commit)
      from  b8bbabadee1e5eee8783e483d22fa182e5d312fc (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 b4d77d7c78c847a6e4fc62e36a80a3a1ad688058
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Jan 14 12:03:10 2015 +0100

    Bug 13578: Make sure the 'public' parameter is passed to the last step

    If no caching system is up ($usecache == 0), the public parameter is
    lost on the step 3.
    The hash passed to the template looks like:
       'cache_expiry', 300,
       'cache_expiry_units',
       'public', 1
    So the template receives cache_expiry = 300, cache_expiry_units =
    'public' and 1 = undef.

    This patch fixes the problem passing the cache_expiry* parameters only
    if the usecache is set.

    Test plan:
    0/ Disable any caching system
    1/ Create a new public report and go up to the 6th step, save the report
    and verify the report is created as public
    2/ Enable a caching system
    2/ Create a public report with a cache expiry value, save it and verify
    the report is created as public and the cache expiry value is correct.

    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit fe986573dd6a6b10dc0456be2609ee29cb459ac8)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit f8ee8c5006d6f9656ceb5402dda0fe13d3aa65a3
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Sat Mar 7 22:22:53 2015 +0100

    Bug 13785: (QA followup) koha-disable should stop the indexer daemon

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit fdca44709e105451908d0e38be44ae3da8f7e496)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit a46c2d21166865079f7f054fae296044bbdc1e31
Author: Larry Baerveldt <larry at bywatersolutions.com>
Date:   Tue Mar 3 07:33:21 2015 -0800

    Bug 13785: koha-disable should also stop SIP and zebra for instance

    Currently koha-disable ONLY disables the instance in the apache conf
    file. Presumably if you want to disable the instance, you also want
    its processes to stop, so this patch will stop zebra, if running,
    and SIP, if enabled.

    Depends on Bug 13784.

    To Test:
    1) Have an enabled instance, with zebra and SIP running.
    2) Run koha-disable INST. Note that after, both zebra and SIP
       will still be running.
    3) Re-enable INST.
    4) Apply patch, and then copy debian/scripts/koha-disable to
       package site, over /usr/sbin/koha-disable.
    5) Run koha-disable INST. You should now see that both zebra
       and SIP have been stopped.

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 1fd9cdcdb03ae77d47a8a19fc92413ef6ba2c999)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 778ae6a30d565fe8da1b71a4410d21dad2a55637
Author: Marc Véron <veron at veron.ch>
Date:   Tue Feb 10 16:37:41 2015 +0100

    Bug 13657 - Don't show extra comma after guarantor name on patron details

    This patch suppresses the first name part (including comma) if first name is empty. This way, first name is still displays with natural persons, but not with organizations.

    To test:
    Apply this patch (without the first patch).
    Have one patron with a natural person as guarantor and one patron with an organization as guarantor. Verify that both display properly on the patron details page.

    Signed-off-by: Jesse Maseto <Jesse at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e0863d9711f6e63f627a6cca1450fde481e935e7)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 02521f7ed2633816fc84c184fb2535500087721d
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Tue May 6 11:20:59 2014 +0300

    Bug 11364: Label layout types and text justification types are not translatable

    To test:

    1) cd misc/translator
    2) perl translate update xx-YY
    3) check that there's no msgids that contain the layout types or
       text justification types in po/xx-YY-i-staff-t-prog-v-3006000.po
    4) apply patch
    5) perl translate update xx-YY
    6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
       msgid for the frequencies. (search for "BLOCK translate_label_types"
       and "BLOCK translate_justification_types")

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

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 901fdce2c658bb4f19396d23a492e2dc6ce28375)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 6420117ecdc6a575d88ea7d47eff7204ee50cf87
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Mar 6 11:08:41 2015 +0100

    Bug 13804 - Returns via the checkouts tables uses the phrase "Returned" rather than "Checked in"

    Test plan:
    1) Apply this patch
    2) Return an item via the checkouts table
    3) Note the left most column now reads "Checked in" rather than "Returned"

    Followed test plan. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit d50163786156b4b4eda37addaeeab957961329d7)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 10084d00ac7bc35b6af0fb233d73a633cd714a76
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Thu Mar 5 15:48:45 2015 -0300

    Bug 13350: Untranslatable strings in aqbudgetperiods.tt

    Counter patch, same test plan as original

    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 379e9cbe1eac5aca880e193691a3dedf22900c5d)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 66afc74c05c5c315591d8de84b18828eb5d6f9b7
Author: Marc Véron <veron at veron.ch>
Date:   Tue Mar 3 11:49:29 2015 +0100

    Bug 13351 - Untranslatable javascript in members.tt

    This patch streamlines the page title text for search results in Home > Patrons to make it translateable (and more readable).

    To test:
    - Apply patch
    - Select Englsh language
    - Apply filter wit several values or click on a letter for "Browse by last name"
    - Verify that the title makes sense
    - Translate to your language and select this language
    - Verify that the text appears properly in your language

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, no problems found.

    http://bugs.koha-community.org/show_bug.cgi?id=13352
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 6004b2492bc945739fd95bb55955ca1fe3f0483b)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 debian/scripts/koha-disable                        |    9 +++++
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js    |    2 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   27 ++++-----------
 .../prog/en/modules/labels/label-edit-layout.tt    |   24 +++++++++++---
 .../prog/en/modules/members/member.tt              |   13 ++++----
 .../prog/en/modules/members/moremember.tt          |    2 +-
 reports/guided_reports.pl                          |   35 +++++++++++++++-----
 7 files changed, 70 insertions(+), 42 deletions(-)

hooks/post-receive
-- 
main Koha release repository