[koha-commits] main Koha release repository branch master updated. v17.11.00-149-g6325f9e
Git repo owner
gitmaster at git.koha-community.org
Mon Dec 18 16:23:32 CET 2017
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 6325f9ed55705f6be55f6fef6d5c94be87b6e58a (commit)
via 4a439d052872a7031c3301b149d1dcf42cb78a74 (commit)
via 25e050e2ef084afb18d09d24ce68a086b4826923 (commit)
via a8f4aacb1db5820b530b2b1dc4072df624f9f1f5 (commit)
via dcc2c5e2d93945e35a7138a832f81bc8178c523d (commit)
via d3cc2a1a9dbb63d080d121c7c2c6f882d03084e8 (commit)
via 63cfdf700b3701fda882989add55bd4562e03e97 (commit)
via 405b0f14a4a629e900df71d19bd4369f1ed94e3f (commit)
via 54d13ca4afb169111cf6bb386f99eb005565b2ac (commit)
via bdccbfcbab7df56d396e667ac6049499a62acf20 (commit)
via 0c07f63e5faf475b937bca8673e691390de91cf4 (commit)
via 6d6c628d85e845da796359de72ef9013ccbb2ebd (commit)
from e66a78d1075ed5a1af995f79bd92b1ffc10036d7 (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 6325f9ed55705f6be55f6fef6d5c94be87b6e58a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Dec 15 10:08:11 2017 +0100
Bug 19444: (QA follow-up) Remove repeating condition
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4a439d052872a7031c3301b149d1dcf42cb78a74
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Dec 15 09:46:54 2017 +0100
Bug 19444: (QA follow-up) Fix tests for UNIMARC
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 25e050e2ef084afb18d09d24ce68a086b4826923
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 5 10:23:09 2017 -0300
Bug 19444: Display error message for auto_account_expired
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a8f4aacb1db5820b530b2b1dc4072df624f9f1f5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 25 16:51:28 2017 -0300
Bug 19444: Do not auto renew if patron is expired and BlockExpiredPatronOpacActions is set
If the patron's account has expired and BlockExpiredPatronOpacActions is set,
we expect auto renewal to be rejected.
Test plan:
Use the automatic_renewals.pl cronjob script to auto renew a checkout
Before this patch, if the patron's account has expired the auto renew was done.
With this patch, it will only be auto renewed if BlockExpiredPatronOpacActions is not set.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dcc2c5e2d93945e35a7138a832f81bc8178c523d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Dec 13 15:46:10 2017 +0000
Bug 19805: Add DataTables to Koha to MARC mapping page
This patch adds sorting and filtering to the Koha to MARC mapping table
using DataTables.
Also changed: Font awesome icons on "Add" and "Remove" buttons; Minor
markup correction to breadcrumbs.
To test, apply the patch and go to Administration -> Koha to MARC
mapping.
- Table should be sorted by default on Koha field.
- Sorting and filtering should work correctly.
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3cc2a1a9dbb63d080d121c7c2c6f882d03084e8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 12 14:38:01 2017 +0000
Bug 19654: Move tools templates JavaScript to the footer: Batch MARC tools
This patch modifies the staff client patron lists templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
Revised: My original patch included changes to batchMod-edit.tt but
didn't take into account the MARC plugins which are loaded in the item
edit form. I have discarded those changes for now.
Tools -> Batch record modification
- Page highlighting in the sidebar
- Patron autocomplete in the "Check out" tab
- Submit records for deletion
- Page highlighting in the sidebar
- Checkbox selection links
- Warning when no records selected
- Patron autocomplete in the "Check out" tab
Tools -> Batch item modification
- Page highlighting in the sidebar
- Patron autocomplete in the "Check out" tab
Tools -> Batch item deletion
- Page highlighting in the sidebar
- Patron autocomplete in the "Check out" tab
- Submit items for deletion
- Patron autocomplete in the "Check out" tab
- Checkbox selection links
- Column-hiding checkboxes
- Datatables
Tools -> Batch record modification
- Page highlighting in the sidebar
- Patron autocomplete in the "Check out" tab
- Submit records for modification
- Page highlighting in the sidebar
- Patron autocomplete in the "Check out" tab
- Checkbox selection links
- Datatables
- MARC preview
- Warning when no records selected
- Progress bar after submitting items for modification
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 63cfdf700b3701fda882989add55bd4562e03e97
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Dec 14 12:54:14 2017 +0000
Bug 19806: Add classes to itemnotes in issues table
To test:
1 - Checkout an item with both public and non-public notes
2 - Note the notes display and both have circ-hlt class
3 - Apply patch
4 - Ensure display has not changed
5 - Note notes now have classes 'item-note-public' and
'item-note-nonpublic'
6 - Sign off
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 405b0f14a4a629e900df71d19bd4369f1ed94e3f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Oct 31 15:57:13 2017 +0100
Bug 19554: The inventory table should jump to detail instead of MARCdetail
This patch just replaces the link to detail.
Detail provides item information needed in case of inventory problems.
Test plan:
Go to Tools/Inventory.
Create an inventory list without barcode file.
Check if the link goes to detail now.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 54d13ca4afb169111cf6bb386f99eb005565b2ac
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 6 13:03:15 2017 -0300
Bug 19759: Make TestBuilder generates only 2 decimals for float
For instance items.replacementprice is decimal(8,2) but more than 2 decimals are generated.
It leads to issues when we compare expected objects:
# got: '135623.866142537'
# expected: '135623.87'
Test plan:
prove t/db_dependent/TestBuilder.t
must return green
Signed-off-by: Dominic Pichette <dominic at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Somehow I have the feeling that we should allow more decimals sometimes
and perhaps have a number of decimals parameter or so. Think of fields
like currency or discount.
But the current issues justify this change.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bdccbfcbab7df56d396e667ac6049499a62acf20
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Sun Dec 17 07:24:53 2017 +0000
Bug 19706: (QA follow-up) Hide the collection code selector if no value is defined (for consistency)
Test plan:
0) Go to item search
1) Do have some authorized values in CCODE category -> selector of
collection is visible
2) Don't have any authorized value in CCODE category -> selector of
collection is not visible
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0c07f63e5faf475b937bca8673e691390de91cf4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Dec 12 11:15:34 2017 +0000
Bug 19706: Fix bad json formed when there are no CCODE values
To test:
1 - Delete all ccode values in your system
2 - Load the item search page
3 - View the console and note a js error
4 - Try to perform an item search to screen
5 - Internal server error ("unsupported format 'html'" in logs)
6 - Apply patch
7 - Reload page
8 - Note js error is gone
9 - Perform search to screen, success!
To test there is no regression:
1 - Have some values in CCODE authorised values
2 - Ensure collection drop down on item search displays correctly
3 - Ensure item search returns results ot screen with no js errors
Signed-off-by Owen Leonard <oleonard at myacpl.org>
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6d6c628d85e845da796359de72ef9013ccbb2ebd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 18 12:12:09 2017 -0300
Bug 18330: (follow-up) Do not return undef explicitely
This patch fixes a perl critic issue, hopefully it will not break
something else.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 5 +
Koha/Object.pm | 2 +-
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
.../prog/en/modules/admin/koha2marclinks.tt | 19 +-
.../prog/en/modules/catalogue/itemsearch.tt | 10 +-
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++
.../prog/en/modules/tools/batchMod-del.tt | 217 ++++++++++----------
.../prog/en/modules/tools/batchMod.tt | 30 +--
.../prog/en/modules/tools/batch_delete_records.tt | 157 +++++++-------
.../en/modules/tools/batch_record_modification.tt | 149 +++++++-------
.../prog/en/modules/tools/inventory.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 11 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +
misc/cronjobs/automatic_renewals.pl | 1 +
t/db_dependent/Circulation.t | 153 +++++++++-----
t/db_dependent/TestBuilder.t | 5 +-
t/lib/TestBuilder.pm | 2 +-
17 files changed, 452 insertions(+), 327 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list