[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.06-3-8-g70e37c9

Fri May 1 09:59:57 CEST 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  70e37c991062f1dafb1599e9ef5e8e87273ce293 (commit)
       via  ba66f3d7c65f6a72b2b02278c550a28911ac36f5 (commit)
       via  1037385428667ca3d14fdf4bbc7e3ee5fb0d4e5c (commit)
       via  546feb10e76db23689875d38b4198d46ca24a312 (commit)
       via  7a4a379668a51b23dbf9e46b9fc3d6c170bc292a (commit)
       via  5fc1db77ebd9553764330b13279332379f8f7395 (commit)
       via  2cf0a7ebe6162abc822bab63feb0f24e80856060 (commit)
       via  6977ea46b13c705aa72abe9f6f4f46430ea3bff1 (commit)
      from  d40955ac3ffc6bbbbc02213afb3a0172e49416a8 (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 70e37c991062f1dafb1599e9ef5e8e87273ce293
Merge: d40955a ba66f3d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri May 1 19:59:50 2015 +1200

    Merge branch '3.18.x-new' into 3.18.x

commit ba66f3d7c65f6a72b2b02278c550a28911ac36f5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 14 15:43:44 2015 +0200

    Bug 10285: Remove links from the error pages

    The error page (400, 401, 402, 403, 404, 405 and 500) displays parts the old
    staff client main page.

    The user can easily browses using navigation links.

    Test plan:
    Go on the 400.pl, 401.pl, 402.pl, 403.pl, 404.pl, 405.pl and 500.pl
    pages, and confirm all is fine and you don't get the old style blocks.

    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    http://bugs.koha-community.org/show_bug.cgi?id=10258
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit c8ea5ca91597cf8b43ffbbaf6edb63c1053adead)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 1037385428667ca3d14fdf4bbc7e3ee5fb0d4e5c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Feb 23 17:09:20 2015 +0100

    Bug 9742: Does not display the popup on creating new record

    The new confirmation on starting a z39.50 serach in cataloguing always
    pops up, even when you are working on a new record that has not been
    saved yet.

    Test plan:
    1/ Edit an existing record, click on the Z3950 search button, confirm
    the popup appears.
    2/ Create a new record, click on the Z3950 search button, confirm
    the popup does not appear.

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

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Works as expected, Gustavo (librarian) convinced me that "it doesn't
    hurt that much" with the test for new record. Happy easter :-D

    (cherry picked from commit f0711f0d0d8f0b824ef9895367a6c7e2389d6e7a)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 546feb10e76db23689875d38b4198d46ca24a312
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Mon Apr 13 15:15:29 2015 -0300

    Bug 13315: (QA followup) fix t/db_dependent/Circulation_issue.t

    C4::Circulation::AddIssue now returns a Koha::Schema::Result::Issue object
    so tests need to be fixed.

    The old behaviour was to always return the due date. It now returns
    undef if no issue performed. So one of the tests become irrelevant.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 73c0c9ef0030002f7b9aa31de8b1c5fa3af80da6)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 7a4a379668a51b23dbf9e46b9fc3d6c170bc292a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Dec 9 10:01:12 2014 -0500

    Bug 13315 [Follow-up] Add feedback for last item checked out to circulation.pl

    This patch changes the position and styling of the information about the
    last checkout so that it is grouped with the checkout form itself,
    placing the message in a more visible position, especially for patrons
    with a lot of information in the right-hand messages column which might
    push the checkouts table down offscreen.

    To test, apply the patch and clear your browser cache in order to
    refresh the main CSS file.

    Check out an item and confirm that a message is prominently displayed.

    Signed-off-by: Jason Burds  <jburds at dubuque.lib.ia.us>
    Signed-off-by: Kyle M Hall <kyle 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 16d438d18b057c5781371327ef04b18855d2f011)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css

commit 5fc1db77ebd9553764330b13279332379f8f7395
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Nov 20 12:39:21 2014 -0500

    Bug 13315 - Add feedback for last item checked out to circulation.pl

    It seems that many librarians find it disconcerting to have no feedback
    with the new checkouts table. It seems that many of them wait for it to
    fully load, check to verify the item was checked out, and only then
    check out the next item.

    To help alleviate this issue, we can have the checkouts page give
    feedback about the item that was just checked out.

    Test Plan:
    1) Apply this patch
    2) Check an item out
    3) Note the message "$title ($barcode) due on $date_due"

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    This works well and fixes a very problematic issue with the new AJAX
    circ. I will be submitting a follow-up which I think is an improvement
    to the display.

    Signed-off-by: Jason Burds  <jburds at dubuque.lib.ia.us>

    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 e96e1126b6a17325002f0d2638dffe4e433bbc5c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Conflicts:
    	C4/SIP/ILS/Transaction/Checkout.pm

commit 2cf0a7ebe6162abc822bab63feb0f24e80856060
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Mar 27 10:03:32 2015 +0100

    Bug 6911: Remember search terms in the log viewer tool

    The modules and actions selected by the user are now selected when a
    log search is done.
    Note that this patch also add the multiple attribute to the actions
    select in order to add the ability to select several actions.
    The code to do that already existed.

    Test plan:
    1/ Go on the log viewer tool (tools/viewlog.pl)
    2/ Launch a search with modules and actions selected.
    3/ Confirm that the values you have selected is still selected after the
    search.

    Patch works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>

    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 b8db092a0acf0c34cd78e35332f73636cdff6e22)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Conflicts:
    	tools/viewlog.pl

commit 6977ea46b13c705aa72abe9f6f4f46430ea3bff1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 8 10:48:26 2015 +0200

    Bug 6007: Fix MARC framework display when only used tags/subfields

    The "Display only used tags/subfields" output breaks DataTables and the
    output is unusable.

    Test plan:
    1/ Go on admin/marctagstructure.pl after you have selected a framework
    2/ Check the checkbox
    3/ The table should be correctly displayed.
    Before this patch, the table have 2 lines per tag, now all data are
    contained into the same line.

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit f5ef85a345af0c628b0576e855d64bb654abb6ce)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Circulation.pm                                  |   29 ++++----
 C4/SIP/ILS/Transaction/Checkout.pm                 |    7 +-
 C4/SIP/ILS/Transaction/Renew.pm                    |    4 +-
 circ/circulation.pl                                |    3 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |   28 ++++++++
 .../prog/en/modules/admin/marctagstructure.tt      |   26 ++++---
 .../prog/en/modules/cataloguing/addbiblio.tt       |    9 ++-
 .../prog/en/modules/circ/circulation.tt            |   15 +++-
 .../intranet-tmpl/prog/en/modules/errors/400.tt    |   75 --------------------
 .../intranet-tmpl/prog/en/modules/errors/401.tt    |   74 -------------------
 .../intranet-tmpl/prog/en/modules/errors/402.tt    |   74 -------------------
 .../intranet-tmpl/prog/en/modules/errors/403.tt    |   74 -------------------
 .../intranet-tmpl/prog/en/modules/errors/404.tt    |   74 -------------------
 .../intranet-tmpl/prog/en/modules/errors/405.tt    |   74 -------------------
 .../intranet-tmpl/prog/en/modules/errors/500.tt    |   73 -------------------
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |   53 +++++++++-----
 t/db_dependent/Circulation.t                       |   18 +++--
 t/db_dependent/Circulation_issue.t                 |   30 ++++++--
 t/db_dependent/rollingloans.t                      |    5 +-
 tools/viewlog.pl                                   |    6 +-
 20 files changed, 158 insertions(+), 593 deletions(-)

hooks/post-receive
-- 
main Koha release repository