[koha-commits] main Koha release repository branch master updated. v19.11.00-1117-g0c9b39a66d
Git repo owner
gitmaster at git.koha-community.org
Wed Mar 11 15:15:59 CET 2020
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 0c9b39a66dff00d2d76effc42824c2051484f9c5 (commit)
via d28bf2de71edb2d895840619d0b70aadff43290a (commit)
via 87f3e2d5e09ce4f0aeb20bb805732e1c050b9629 (commit)
via 818ce7ac998b50b1e0d094082b75de1fd1c4f0de (commit)
via 218012812d2c95f7e5013a4bb0a2684a4eec7378 (commit)
via 2c3b0f4d57c73b1775780d48703cbb5af82e58d3 (commit)
from 52db77b93ead47914e049f1e32e102e6b0dab40b (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 0c9b39a66dff00d2d76effc42824c2051484f9c5
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Feb 14 10:44:39 2020 +0100
Bug 24662: Remove global variables MSG_* from datatables.inc
Now that bug 21156 is pushed, we don't need to have global variables in
.inc or .tt files for translation in .js file. We can simply declare our
translatable strings where they are used.
This patch removes all global variables used in DataTables configuration
Test plan:
1. cd misc/translator && ./translate update fr-FR
2. Translate strings in misc/tranlator/po/fr-FR-messages-js.po
3. cd misc/translator && ./translate install fr-FR
4. Go to the staff interface, in english, and check that DataTables
tables are still working. You should check at least the following pages:
- catalogue/detail.pl
- circ/circulation.pl
- tools/quotes.pl
- tools/letter.pl
5. Switch to french and check again DataTables tables, and verify that
strings are translated
This patch depends on bug 24661
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d28bf2de71edb2d895840619d0b70aadff43290a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Mar 5 14:32:23 2020 +0000
Bug 24812: (bug 24081 follow-up) Add permission description
Bug 24081 added a discount permission to the accounts system but during
subsequent rebases, the description of that new permission got lot.
This patch restores the description.
Test plan
0/ Check that a checkbox without a description appears in the 'Manage
patrons patrons fines and fees' section of the 'Set permissions' page.
1/ Apply the patch
2/ Reload the page and note that the checkbox now preceeds a suitable
description.
3/ Signoff.
Bonus points: Check the permission works as described and hides the
'Discount' action button for staff who do not have the permission
enabled.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 87f3e2d5e09ce4f0aeb20bb805732e1c050b9629
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Feb 3 11:14:50 2020 +0000
Bug 24565: Add patron profile to ILL list pages
We need the API call to get ILL requests on the patron profile page,
this commit allows this.
Test plan:
- Do not apply the patch.
- Go to the "Ill requests history" page for a patron who has made ILL
requests
- TEST: Observe that no requests are displayed
- Apply the patch
- Refresh the page
- TEST: Observe that requests are displayed
- Go to the main "ILL requests" page
- TEST: Observe that requests are displayed
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 818ce7ac998b50b1e0d094082b75de1fd1c4f0de
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Mar 11 11:27:38 2020 +0000
Bug 24839: (QA follow-up) Remove unused variables
Whilst QAing I spotted a couple of unused variables in the test.. no
harm in removing them ;)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 218012812d2c95f7e5013a4bb0a2684a4eec7378
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 10 09:37:56 2020 -0400
Bug 24839: Return hold info to transfer script and set borrowernumber
To test:
1 - Place a hold on an item
2 - Go to Circulation->Transfers
3 - Attempt to transfer item to a branch it is not expected at
4 - No warning
5 - Apply patches
6 - Repeate
7 - You get a notice that there is a hold and must deal with the hold (or ignore)
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2c3b0f4d57c73b1775780d48703cbb5af82e58d3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 10 09:59:16 2020 -0400
Bug 24839: Unit tests
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 3 +-
circ/branchtransfers.pl | 1 +
.../intranet-tmpl/prog/en/includes/datatables.inc | 24 -----------
.../intranet-tmpl/prog/en/includes/permissions.inc | 5 +++
.../prog/en/modules/circ/circulation.tt | 1 -
.../intranet-tmpl/prog/en/modules/tools/quotes.tt | 18 +--------
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 5 ++-
koha-tmpl/intranet-tmpl/prog/js/datatables.js | 46 +++++++++++-----------
koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js | 12 +++++-
koha-tmpl/intranet-tmpl/prog/js/letter.js | 4 +-
koha-tmpl/intranet-tmpl/prog/js/table_filters.js | 4 +-
t/db_dependent/Circulation/transferbook.t | 32 ++++++++++-----
12 files changed, 70 insertions(+), 85 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list