[koha-commits] main Koha release repository branch master updated. v3.20.00-402-g75d123d

Tue Aug 18 18:16:51 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, master has been updated
       via  75d123d760d86f0e0d9f58d65874b40f6816008d (commit)
       via  75c70d42a5df526c8bed8633d65721696a0fa176 (commit)
       via  748b212cf9a21440f62acc3dec29a93132795082 (commit)
       via  3ec6c88ae10868fcab17b5b29c3b84f159323e25 (commit)
       via  4a738888adfaca7ab5935c320e14a12309797334 (commit)
       via  e1319963d618968cb61a5c86a0c793fc613354ee (commit)
       via  a90a7202c31cbb353741b5c563945e58923cd319 (commit)
       via  a145b437852542c5314e5cc1d5576b4eb050525c (commit)
      from  dfe07fa410eb48241c218abcc156c466576dcc9a (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 75d123d760d86f0e0d9f58d65874b40f6816008d
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue Jul 21 00:29:52 2015 +0000

    Bug 14574: Fixing error messages on staff client so they make more sense

    To test:
    1) Go to cgi-bin/koha/errors/errornumber.pl to see the error messages which currently don't make sense (ie cgi-bin/koha/errors/401.pl etc). Have only made changes to 401, 403 and 404
    2) Apply patch
    3) Go to cgi-bin/koha/errors/401.pl --> Check that it now says "This error means that you aren't authorized to view this page." and "Please log in and try again.". Check that 'log in' redirects to the log in page (mainpage.pl).
    4) Go to cgi-bin/koha/errors/403.pl --> Check that it now says "This error means that you are forbidden to view this page."
    5) Go to cgi-bin/koha/errors/404.pl --> This page should be very different. Check that the 'Error 404' is now in italics and not bold. Check that the page gives a list of reasons the user may have been given this error and some options for their next step.

    Signed-off-by: Catherine <cnorthcott.work at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: replace tab with 4 spaces.
    Note: I am not sure the em tag is useful here.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 75c70d42a5df526c8bed8633d65721696a0fa176
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 14 16:26:36 2015 +0100

    Bug 14517: List shelves list is broken for translated interfaces

    The translation script adds quotes ("") around translated string (Edit
    for instance).
    Which breaks the json structure.

    Example:
    "dt_action": "<a style=\"cursor:pointer\"><form action='shelves.pl'
    method='get'><input class="editshelf" value="Editar" type="submit"
    /></form></a>"

    Test plan:
    1/ On the staff interface create a private list
    2/ Go to More > Lists ('Your lists' tab)
    3/ Translate the templates to any language like:
      $ cd misc/translator/
      $ perl translate install es-ES
    4/ Enable the translated templates on the sysprefs
    5/ Switch to the translated language
    6/ Go to the lists page (Mas > Listas in es-ES)
    The list should be displayed correctly.

    Note: There is a limitation. If a translated string contains a simple
    quote ('), it will also break the json.

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 748b212cf9a21440f62acc3dec29a93132795082
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 18 12:43:27 2015 +0100

    Bug 14529: The new list permission is 'lists', not 'shelves'

    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 3ec6c88ae10868fcab17b5b29c3b84f159323e25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 17:53:06 2015 +0100

    Bug 14529: Allow user to delete lists

    Bug 13417 allows a librarian to delete any lists if he has the
    permission (delete_public_lists).

    There is a mismatch in the perm check.
    A user can delete a list with the ability to edit (manage) it.

    Test plan:
    1/ Create a list A with user A
    2/ Create a list B with user B
    3/ A should be able to manage and delete the list A.
    He cans delete B only if he is superlibrarian or has the
    delete_public_lists permission.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 4a738888adfaca7ab5935c320e14a12309797334
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 18 16:51:19 2015 +0100

    Bug 11229: Make the tests pass even if issues exist in the DB

    This is not introduced by the previous patches of this patchset.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e1319963d618968cb61a5c86a0c793fc613354ee
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Thu Aug 13 12:03:15 2015 -0300

    Bug 11229: (followup) makepartialpayment fix

    makepartialpayment() wasn't logging the branch either. This patch
    fixes that too.

    To test:
    - Run (with the regression tests applied)
      $ prove t/db_dependent/Accounts.t
    => FAIL: tests fail because makepartialpayment is not logging the branch code
    - Apply the patch
    - Run
      $ prove t/db_dependent/Accounts.t
    => SUCCESS: tests pass
    - Sign off :-D

    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a90a7202c31cbb353741b5c563945e58923cd319
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 03:51:02 2015 +0200

    Bug 11229: makepayment doesn't log branch in statistics correctly

    This patch fixes makepayment() so it correctly logs the branch code
    to the statistics table.

    To test:
    - Run (with the regression tests applied)
      $ prove t/db_dependent/Accounts.t
    => FAIL: makepayment() tests fail because logging is wrong
    - Apply the patch
    - Run
      $ prove t/db_dependent/Accounts.t
    => SUCCESS: tests for makepayment now pass
    (Note: makepartialpayment tests still fail as they need the next patch)

    Original commit message relying on the UI to test:

    There are several ways of paying fines, not all of them
    recorded the branch the payment was made at correctly:

    1) Pay button next to an individual fine
    2) Checkbox + pay amount
    3) Checkbox + pay selected

    For each of those, check if the payment registered in
    the table statistics contains the branchcode before
    and after the patch.

    The patch should fix 1).
    2) and 3) are ok with and without the patch.

    Important: Don't change the amount, pay individual fines.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    Note: i fixed the commit message, because this is a fix for makepayment

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a145b437852542c5314e5cc1d5576b4eb050525c
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Thu Aug 13 11:32:49 2015 -0300

    Bug 11229: (regression tests) makepayment and makepartialpayment should log correctly

    This patch introduces tests for makepayment and makepartialpayment to check
    they are correctly logging to the statistics table.

    To test:
    - Run
      $ prove t/db_dependent/Accounts.t
    => FAIL: tests fail because statistics are not correctly logged.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Accounts.pm                                     |   24 +-
 C4/VirtualShelves.pm                               |    2 +-
 .../intranet-tmpl/prog/en/modules/errors/401.tt    |    3 +-
 .../intranet-tmpl/prog/en/modules/errors/403.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/errors/404.tt    |   17 +-
 .../virtualshelves/tables/shelves_results.tt       |   35 +-
 t/db_dependent/Accounts.t                          |  395 +++++++++++++-------
 7 files changed, 311 insertions(+), 167 deletions(-)

hooks/post-receive
-- 
main Koha release repository