[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-14-g50f4e86

Thu Aug 2 15:55:08 CEST 2018

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, 18.05.x has been updated
       via  50f4e8635056d7b664b846db91d48bf282fef949 (commit)
       via  1d9ae5ecc60a875e82f861ed9267d76c09f9335b (commit)
       via  af2c813745657e5c367bad776beb6c956e6e16db (commit)
       via  15040308a44d8ac8e48f13146bf97befd3294bb4 (commit)
       via  f9f270efd6f40afdd3be861d7bd77e29bff769ec (commit)
       via  a332214dd3880856c3577476ad45018896faf113 (commit)
       via  9f52475eadb530ffc7be959444503c4d9d9ab26b (commit)
       via  585a10e070136b231d88b8ff4099b4085a2b656c (commit)
       via  9d025f422b372c3cb0383dd6cced89d7d15f088e (commit)
       via  a9237380b51b297d4be2f9f9eb7c9bd6fda0ec26 (commit)
       via  9b61f7e664d5a6dfb00d39b9ca6030e622df5313 (commit)
       via  19f1352794665620dfd4f698a6b6f15e52afd91e (commit)
       via  12e8634c00453a6ee072e7988b2ffdc7a8936991 (commit)
       via  781b254ee1885cf7019ab7f635cfc91ffa3e3b3e (commit)
      from  581957844182e4970b39401ae8cf2757dc335a04 (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 50f4e8635056d7b664b846db91d48bf282fef949
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 13 17:49:14 2018 +0000

    Bug 21076: Don't call autocomplete code after patron found

    To test:
    1 - Enable article requests
    2 - Search on staff client
    3 - Click 'Request article'
    4 - Find a patron
    5 - View error in console
    6 - Apply patch
    7 - Reload
    8 - Not error is gone

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Followed the test plan and it works.

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5a9bad787458411c790d26b3b115fe3e7e2e0ab2)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 1d9ae5ecc60a875e82f861ed9267d76c09f9335b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Jul 15 20:00:44 2018 +0200

    Bug 16575: (follow-up) Compiled CSS

    This patch contains the compiled CSS for the OPAC print stylesheet.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit c02543baaab99841405ba9a47d894e54e7a8a27a)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit af2c813745657e5c367bad776beb6c956e6e16db
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed May 30 14:15:19 2018 +0000

    Bug 16575: Irregular behaviour using window.print() followed by window.location.href

    This patch updates the OPAC and staff client carts to use CSS to
    control print output, removing a print parameter which was passed to the
    script.

    Currently, when you click "Print" on the OPAC basket, it navigates to
    a new page and initiates window.print() followed by a
    window.location.href change again. Unfortunately, due to differences in
    IE, Chrome, and FF, it will either show the print options, navigate away
    without showing them, or refuse to navigate away after printing. By
    changing to using print CSS, we don't navigate away from the basket in
    the first place, so we prevent this irregular behavior.

    TEST PLAN

    1) Apply the patch
    2) Create an OPAC basket by clicking "Add to cart" on multiple items
    3) Using Chrome, IE, and Firefox (of any version), click the "Print"
       button
    4) You should see the relevant print menu without the OPAC basket
       re-loading in any way.
    5) After printing is complete, you should still be on the OPAC basket
       pop-up
    6) Perform the same tests in the staff client

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

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit a9836864dcbe4c11d370c245511ee4b9d6bd33f3)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 15040308a44d8ac8e48f13146bf97befd3294bb4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 29 17:36:51 2018 -0300

    Bug 20806: Surround string by span tag to help translation

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit eac802b712bd60c8307da7b6f709d347ffa4ffe3)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit f9f270efd6f40afdd3be861d7bd77e29bff769ec
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 29 17:30:39 2018 -0300

    Bug 20806: Do not rely on column position

    It is not the first time we have this splice call, it seems safer to
    rely on the column's name instead of the column's position

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 2a369663fd37c41fb3ac810a8f42d84d69fa6f02)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a332214dd3880856c3577476ad45018896faf113
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue May 29 09:15:09 2018 +0000

    Bug 20806: Add item type description holds history page

    Test plan:

    0) Do not apply the patch
    1) Set AllowHoldItemTypeSelection to Allow
    2) Place some hold for a patron, some with specific item type and some
    without item type
    3) On holds history page you should see blank or item type code in item
    type column
    4) Apply the patch
    5) Now you should see description in item type column
    6) Set AllowHoldItemTypeSelection to Don't Allow
    7) You shold not see the item type column, but column visibility
    settings should continue working ;)

    Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
    Followed the test plan and it works.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 0c1490ec7111fb6160458463d98ccda333f347b3)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 9f52475eadb530ffc7be959444503c4d9d9ab26b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jan 23 15:54:41 2018 -0300

    Bug 20079: Display stack trace for development installations

    """The default value is development, which causes plackup to
    load the middleware components: AccessLog, StackTrace, and Lint unless
    --no-default-middleware is set."""

    Test plan:
    Confirm that the stack trace is displayed when something is wrong (die somewhere to test)
    for dev installations (inside a devbox)
    The -E flag must remain deployment for non-dev installs

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 8520d508a3154c6b30f1e710e518fe3b697a3194)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 585a10e070136b231d88b8ff4099b4085a2b656c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Jul 16 18:41:13 2018 +0000

    Bug 21038: Reserves should be holds

    This patch corrects the text of the warning about discharges cancelling
    holds.

    To test, apply the patch and view the discharge for a patron who has
    holds:

     - "Borrower" is changed to "patron"
     - "reserves" is changed to "holds"
     - "canceled" (18 instances in the templates) is changed to "cancelled"
       (51 instances).

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

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 8202f95ad7001a5046f9f40e6322406b253ba3ed)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 9d025f422b372c3cb0383dd6cced89d7d15f088e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Jul 2 16:18:33 2018 -0300

    Bug 20942: (QA follow-up) Use $lines->total_outstanding

    This patch makes the controller code use $lines->total_outstanding
    instead of expecting ->outstanding_debits and ->outstanding_credits
    return the total.

    Tests should pass as before. No behaviour change is expected.

    To test:
    - Run:
      $ kshell
     k$ prove t/db_dependent/api/v1/patrons_accounts.t
    => SUCCESS: Tests still pass, no behaviour change.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 6672b26d16065d877d6d7300830fc3d619b09898)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a9237380b51b297d4be2f9f9eb7c9bd6fda0ec26
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Jun 25 14:55:30 2018 -0300

    Bug 20942: Split debit and credit lines

    This patch splits the balance to match this object schema:

    {
        balance             => #,
        outstanding_credits => {
            total => #,
            lines => [ credit_line_1, ..., credit_line_n ]
        },
        outstanding_debits  => {
            total => #,
            lines => [ debit_line_1, ..., debit_line_m ]
        }
    }

    This change is made to ease usage from the UI. Also because the
    outstanding credits need to be applied to outstanding debits in order to
    the balance value to make sense. So we still need to have each total.

    Tests are added for this change, and the schema files are adjusted as
    well.

    To test:
    - Apply this patch
    - Run:
      $ kshell
     k$ prove t/db_dependent/api/v1/patrons_accounts.t
    => SUCCESS: Tests pass!
    - Sign off :-D

    staff_id is changed into user_id as voted on the dev meeting the RFC got
    approved.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit bb7c908dc06697a4ebbf8633897d24e26798cb6d)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 9b61f7e664d5a6dfb00d39b9ca6030e622df5313
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jun 13 14:02:44 2018 -0300

    Bug 20942: Add route to get patron's account balance

    This patch implements the /patrons/{patron_id}/account endpoint. It can
    be used to get the patron's balance information, including outstanding
    lines.

    To test:
    - Apply this patchset
    - Run:
      $ kshell
     k$ prove t/db_dependent/api/v1/patrons_accounts.t
    => SUCCESS: tests pass!
    - Make your favourite REST testing tool (RESTer on Firefox?) do:
      GET /api/v1/patrons/{patron_id}/account
    to a valid patron_id. Play with Koha's UI to add credits/payments and
    notice the endpoint returns the right info following the voted RFC. [1]
    - Sign off :-D

    [1] https://wiki.koha-community.org/wiki/Patrons_account_lines_endpoint_RFC

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

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d079c80b05b36a177c80d8f585ae1515092e6ddb)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 19f1352794665620dfd4f698a6b6f15e52afd91e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jun 13 14:02:30 2018 -0300

    Bug 20942: Unit tests for /patrons/{patron_id}/account

    This patch adds tests for the /patrons/{patron_id}/account endpoint.
    To test:

    - Run:
      $ kshell
     k$ prove t/db_dependent/api/v1/patrons_accounts.t
    => FAIL: Tests should fail because the endpoint is not implemented.

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

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7cbff1bce1608016e8b8ceded7633678189b75cc)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 12e8634c00453a6ee072e7988b2ffdc7a8936991
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Jun 1 16:04:35 2018 -0300

    Bug 20942: OpenAPI spec for /patrons/{patron_id}/account

    This patch adds the OpenAPI spec for the following paths:
    - /patrons/{patron_id}/account

    It also adds object definitions for:
    - balance
    - account line

    Account line is to be used on both /account/lines (when implemented)
    and for embeding the outstanding lines in the balance endpoint
    (/patrons/{patron_id}/account).

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

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d383b49987b8e5471cb9f30ed879e1311e762b26)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 781b254ee1885cf7019ab7f635cfc91ffa3e3b3e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Wed Aug 1 09:01:44 2018 +0100

    Bug 6647: Revert - Label item search should use standard pagination routine"

    This reverts commit 35fb1fe67cef029201eef6fd53c2d0e4af82195c which
    depends on a bug not being backported to the 18.05.x branch.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 Koha/REST/V1/Patrons/Account.pm                    |  165 ++++++++++++++++++
 api/v1/swagger/definitions.json                    |    7 +-
 api/v1/swagger/definitions/account_line.json       |   81 +++++++++
 api/v1/swagger/definitions/patron_balance.json     |   40 +++++
 api/v1/swagger/paths.json                          |    3 +
 api/v1/swagger/paths/patrons_account.json          |   65 +++++++
 basket/basket.pl                                   |    2 -
 debian/scripts/koha-plack                          |    5 +
 koha-tmpl/intranet-tmpl/prog/css/print.css         |   30 +++-
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css  |    5 +
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |   55 ++----
 .../prog/en/modules/circ/request-article.tt        |   38 +++--
 .../intranet-tmpl/prog/en/modules/labels/result.tt |   53 +++---
 .../prog/en/modules/members/discharge.tt           |    2 +-
 .../prog/en/modules/members/holdshistory.tt        |   21 ++-
 koha-tmpl/intranet-tmpl/prog/js/basket.js          |    3 +-
 koha-tmpl/opac-tmpl/bootstrap/css/print.css        |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-basket.tt  |    4 +-
 koha-tmpl/opac-tmpl/bootstrap/less/print.less      |   17 +-
 t/db_dependent/api/v1/patrons_accounts.t           |  178 ++++++++++++++++++++
 20 files changed, 683 insertions(+), 93 deletions(-)
 create mode 100644 Koha/REST/V1/Patrons/Account.pm
 create mode 100644 api/v1/swagger/definitions/account_line.json
 create mode 100644 api/v1/swagger/definitions/patron_balance.json
 create mode 100644 api/v1/swagger/paths/patrons_account.json
 create mode 100644 t/db_dependent/api/v1/patrons_accounts.t

hooks/post-receive
-- 
main Koha release repository