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

Mon Dec 16 14:09:56 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  243f820d2597597d87a722ec00f39cacb8929e0e (commit)
       via  1a8154482f134c94ebf102a9a77e1bfa08e69615 (commit)
       via  cb5a3bdd3cd7976ec00b0f1e082eba6cc1b9180a (commit)
       via  8ccb6dbf80076b36d77e21c99a57881c1c459fa3 (commit)
       via  287106c640aa76bcef45e0619a4a6361381a298f (commit)
       via  9dd158f5aa13fe653921f692c3c68ab9091aeab0 (commit)
       via  779490cf18da22f818399b903cff263ac60d3f69 (commit)
       via  bfe7ead7c815aec3133bafae59253e9924e78fe0 (commit)
       via  89fcf9d31d880f2f5d9610f0e4fd86fa7dd05f0e (commit)
      from  20c58b3a45c97aab6d5c5feb91abea0be472bd64 (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 243f820d2597597d87a722ec00f39cacb8929e0e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Nov 7 14:25:50 2013 +0100

    Bug 7491: improve description of the item-level_itypes syspref

    Adding some text to the pref description referring to OPAC display.

    Test plan:
    Look at the new description in Cataloging preferences.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5dcf1857dac7d4c4a75a4e630938b8462542bcf3)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    (cherry picked from commit 735b7ea1909c7f3cf45855fc54931d837459f20e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 1a8154482f134c94ebf102a9a77e1bfa08e69615
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Mon Oct 28 13:46:06 2013 +0100

    Bug 11146: Show a go back link on no permission page

    When a user does not have permissions for a page or module, the
    authentication page is displayed with message

      "Error: You do not have permission to access this page.".

    Most librarians uses the "previous page" button of their browser to
    come back on the page they were before trying to get to the
    non-permitted page.

    This patch adds a button to help coming back to previous page.
    It also changes the "Click to log out" link as a button.

    Test plan :
    - Define a user with staff permissions but no permission on tools module
    - Login with this user
    => You get to intranet home page
    - Edit URL to go to tools module : cgi-bin/koha/tools/tools-home.pl
    => You get a page with a red error message and 2 buttons "Previous page"
       and "Log out"
    - Click on "Previous page"
    => Go get to intranet home page
    - Edit URL to go to tools module : cgi-bin/koha/tools/tools-home.pl
    - Click on "Log out" button
    => You are logged-out and get to authentication page : cgi-bin/koha/mainpage.pl?logout.x=1

    Signed-off-by: Garming Sam <garming at catalyst.net.nz>

    Works as intended.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit d1bec841428de08402628e21b75f7fc6c6e0c361)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    (cherry picked from commit 1afd62e5c216a1f6cbf366dce04f5d262d9ec270)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit cb5a3bdd3cd7976ec00b0f1e082eba6cc1b9180a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Oct 16 13:55:22 2013 +0200

    Bug 11061: remove unused routine Koha::Calendar::_mock_init

    Bug 9209 removes the only occurrence to Koha::Calendar::_mock_init
    The routine can be removed.

    Test plan:
    prove t/Calendar.t

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    I left that routine because I planned to do a follow-up for that so the
    Calendar patch series was pushed soon. Nice catch Jonathan, works as expected.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, t and xt

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 55b13c092a6b4a1d1e89e08837e2f0c1d2bb84b9)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    (cherry picked from commit 88959bcd111bcc8499c8fddc56f7a4bf5189af46)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 8ccb6dbf80076b36d77e21c99a57881c1c459fa3
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Fri Oct 4 11:01:27 2013 +0100

    Bug 10996: Allow numeric subfields to be stripped on export

    Regex assumed all numeric characters were part of the tag number
    This is obviously false as $9 would be a likely candidate
    to be removed on export.

    The code can be any printing ascii character other than space
    according to LoC's website.

    Also changed regexp to no longer allow a zero length tag number
    which is nonsensical.

    The old regex would accept shorter than 3 digit tags but these were
    not stripped so I've removed that option, considering it a bug
    not a feature

    NB assumption that the code makes that a tag is always numeric is
    incorrect but works in practice. Handling non-numeric tags is
    a 'To be done'

    Made code dependent on the regex succeeding. Picking up results
    from a previous regex on failure can lead to weird hard to
    identify bugs

    In the course of testing Paola Rossi <paola.rossi at cineca.it>
    spotted that the delete operation was flawed, only removing
    the first occurence of the specified tag/tag subfield. Reworked
    the delete loop to operate on all occurences

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 248283fc29b46f59c56769a14f8d811cc61834ff)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    (cherry picked from commit 28d1d74c16be3ac28c51a619ede8567e06a02a27)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 287106c640aa76bcef45e0619a4a6361381a298f
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Nov 13 16:29:40 2013 +0100

    Bug 11245: fix typo in modborrowers.tt javascript string

    In modborrowers.tt, Bug 8986 made the javascript strings translatable:
      _("This attribute will be only applied to the patron\'s category")

    In this case, the backslash is useless.

    Test plan :
    - Create a borrower attribute with a "Category" defined
    - Go to Tools / Batch patrons modification
    - Enter a cardnumber and submit
    - Next to "Attribute", select the borrower attribute you created
    => You see a grey text at the right : This attribute will be only
       applied to the patron's category "XXX"

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 2a4fa0a80307bf61a82a180220504c633000db7f)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    (cherry picked from commit 8a5e370bc1842093fe2165e3ddd2c50f8616e943)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 9dd158f5aa13fe653921f692c3c68ab9091aeab0
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri Aug 30 15:19:25 2013 +0200

    Bug 10809: use branches template plugin in serials search

    In serials-search.pl, branch name was computed using branch code and
    then passed to template.

    This patch uses the new template plugin now for this:
        Koha::Template::Plugin::Branches.

    Test plan :
    - Go to serials search
    - Perform a search that returns at least an open an a closed subscription having a branch defined
    => The branch name is displayed in "Library" column

    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7ca790997ed6adebb7edafc04b6f1aa136ce7cc2)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    (cherry picked from commit c397efcfe442bf09bb5f5902b9ac921ac4c902bc)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 779490cf18da22f818399b903cff263ac60d3f69
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Nov 21 09:27:39 2013 +0100

    Bug 7143: Cleaning up docs/history.txt

    Sorting some lines on date
    Typo on date for Bernardo Kriegel
    Splitting one line in 2008 in two lines
    Replacing some tabs with spaces in October 2013

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    No typos or problems found.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 72b8267c3ff412d7c7927bade83f39ea46df519b)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit bfe7ead7c815aec3133bafae59253e9924e78fe0
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Wed Nov 27 05:37:07 2013 +1300

    Bug 11307: Fix potential XSS attack in public catalog RSS feed

    To test:
    1/ Craft a url like
    /cgi-bin/koha/opac-search.pl?q=a&count=50"'<h1>test</h1>&sort_by=acqdate_dsc&format=rss2
    2/ look at the source, notice
    <opensearch:itemsPerPage>50"'<h1>test</h1></opensearch:itemsPerPage>
    3/ apply the patch, and reload url
    4/ source now contains
     <opensearch:itemsPerPage>50"'<h1>test</h1></opensearch:itemsPerPage>

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 682e706a4ac10b416b51bdb1ea8894dbe21b345e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 89fcf9d31d880f2f5d9610f0e4fd86fa7dd05f0e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Nov 21 01:58:05 2013 +0000

    Update history.txt for Koha 3.14.0 release

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3fe0e784516309050fc5b6eda1ab7fdaf7643048)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 Koha/Calendar.pm                                   |   29 --------------------
 docs/history.txt                                   |   22 +++++++++++++--
 koha-tmpl/intranet-tmpl/prog/en/css/login.css      |   11 +++++++-
 .../en/modules/admin/preferences/cataloguing.pref  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |    9 +++++-
 .../prog/en/modules/serials/serials-search.tt      |    5 ++--
 .../prog/en/modules/tools/modborrowers.tt          |    2 +-
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |    2 +-
 serials/serials-search.pl                          |    1 -
 tools/export.pl                                    |   29 +++++++++++---------
 10 files changed, 60 insertions(+), 52 deletions(-)

hooks/post-receive
-- 
main Koha release repository