[koha-commits] main Koha release repository branch master updated. v18.11.00-1293-gbe0d338
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 24 13:58:15 CEST 2019
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 be0d338366589ef80b69f287d7dbfc059476e4b2 (commit)
via 7d598d9130c3d171af1e1a6a0a168cea043c277d (commit)
via 1d845a1b3765f9ca11e526a0ea78dd0947246f4d (commit)
via aa6c41db8dd60a0eb27560c515ffaab5f9371c42 (commit)
via e7e1f2faeea94d2568779f9e7bbdc100909561c3 (commit)
via cac5edd81d58a399b2254f378593fdb44a893826 (commit)
via 097a6af3b03a90af8c42a4ea8139edca8c9eb616 (commit)
via 40ed0baba7f1156ba63d2a8ee095b40db66e13c8 (commit)
via 4a0fa82a5b3ed2f493c55c1b74bf3dac2738c47f (commit)
via 95e074414758c84800281e410cabd258b1d4741d (commit)
via 6416ead3cb5f992146822f7de6b242a814d1a1be (commit)
via 0a22e3127d90c9d76734b223523e0635b18cb32d (commit)
via e3b68414373ee23418a6dc3ce10e859ae8fb66b8 (commit)
via 0e762da67092e8bd04e37908e9e1419ea16f70e3 (commit)
via f76f93ecf191231036c96b17fceccf819247959f (commit)
via 6fa21ef939785c1fd757a4755cd9b12ed09a18a0 (commit)
via f11bda813695e025a3e0f45463d7f710d82548af (commit)
via b639271a615aaf9dce0d6fc2fd0dc7e22e8cf74a (commit)
via 6f4565ce686919ada0bc95ea26497ff80e4df250 (commit)
via b78bd2faec703bb7d7c750dbc1070ba2449f29a9 (commit)
via d8a759162cde8f373ea945a7e509102ec81878e0 (commit)
via d9ce1567937de5fe115ec8595db63b7cfe80d8d6 (commit)
via 6d9839d800ac8334a902cba5917b878507f8ba18 (commit)
via 22deca9445cb02320a04abb69febc9ef83d4d58f (commit)
from 3d840153d1e9736f126b04b96eea4367d096996b (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 be0d338366589ef80b69f287d7dbfc059476e4b2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Apr 22 18:50:15 2019 +0000
Bug 22751: Switch two-column templates to Bootstrap grid: Patron details
This patch updates the patron details page template to use the Bootstrap
grid.
To test, apply the patch and view the detail page for a patron in the
staff client. Adjust the browser width and confirm that the page adapts
to different sizes.
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7d598d9130c3d171af1e1a6a0a168cea043c277d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 23 15:41:50 2019 +0000
Bug 21034: Re-indent circulation.tt
This patch reindents the template for the checkout page, circulation.tt:
- Trailing spaces removed
- Indentation changed to a consistent 4 spaces
- Markup indentation made more consistent
To test, view the checkout page under various circumstances:
- No card number submitted
- Name submitted (patron search results)
- Card number submitted
- Restricted patron
- Patron with circulation messages
- On-site checkouts
- Check all tabs: checkouts, relatives' checkouts holds, article
requests, restrictions, clubs
HTML validation before and after the patch should return the same
results.
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1d845a1b3765f9ca11e526a0ea78dd0947246f4d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 22 12:47:40 2019 +0000
Bug 22418: (follow-up) OPAC changes
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aa6c41db8dd60a0eb27560c515ffaab5f9371c42
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 22 12:39:08 2019 +0000
Bug 22418: Add magnifying glass to 655 results
To test:
1 - Have some 655 fields linked to authorities
2 - Notice they have no magnifyiung glass
3 - Apply patch
4 - Note they have one now
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e7e1f2faeea94d2568779f9e7bbdc100909561c3
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Apr 10 00:02:09 2019 +0200
Bug 22674: Change wording of payments in the GUI
This changes the different versions of "Payment, thanks"
to just read "Payment".
To test:
- Look at the Fines & Charges tables in
- OPAC patron account > your fines
- Staff patron account > Accounting > Transactions tab
- Staff patron account > Accounting > Make a payment tab
- Verify all tables display the descriptions correctly
- Decide if you like this better than before
Yes: sign-off
No: comment on the bug please
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cac5edd81d58a399b2254f378593fdb44a893826
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 7 18:55:57 2018 +0000
Bug 21784: Clean up js_includes.inc
This patch cleans up js_includes.inc by removing script "type"
attributes which are now invalid HTML. The patch also removes "CDATA"
markers from script blocks. They have been unnecessary since we stopped
using an XHTML doctype.
To test, apply the patch and look at various pages in the staff client
to confirm that no JavaScript-driven interactions are broken.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 097a6af3b03a90af8c42a4ea8139edca8c9eb616
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Apr 22 10:20:17 2019 -0300
Bug 22696: Prefetch items too
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 40ed0baba7f1156ba63d2a8ee095b40db66e13c8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Apr 19 11:29:49 2019 -0300
Bug 22696: (follow-up) Use new relationship for prefetching
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4a0fa82a5b3ed2f493c55c1b74bf3dac2738c47f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Apr 12 15:22:30 2019 -0300
Bug 22696: Simplify visibility logic in opac-ISBDdetail.pl
This patch removes many DB queries and uses state-of-the-art Koha code
to accomplish the same things it did before.
To test:
- Apply this patch
- Open opac-ISBDdetail.pl for a known record
=> SUCCESS: No behaviour change.
- Sign off :-D
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 95e074414758c84800281e410cabd258b1d4741d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Apr 22 10:08:41 2019 -0300
Bug 22701: Make items prefetchable from Koha::Biblio
This patch makes Koha::Biblio->items use _new_from_dbic instead of
calling Koha::Items->search. This allows calling it with prefetch
enabled for the items relationship. No noticeable behaviour change takes
place besides this.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Biblio.t
=> SUCCESS: Tests pass!
- Apply this patch
- Run:
k$ prove t/db_dependent/Koha/Biblio.t
=> SUCCESS: Tests still pass!
- Sign off :-D
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6416ead3cb5f992146822f7de6b242a814d1a1be
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Apr 20 09:47:43 2019 -0300
Bug 22701: Unit tests for Koha::Biblio->items
This patch adds tests fr the current items() implementation. The idea is
to verify no behaviour change takes place after we make it us
_new_from_dbic instead of calling Koha::Items->search.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Biblio.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0a22e3127d90c9d76734b223523e0635b18cb32d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Apr 23 15:49:28 2019 +0100
Bug 22694: Add Koha::Patron::Category->override_hidden_items
This patch introduces a method to determine for a given category if
patrons belonging to it override OpacHiddenItems policies.
To test:
- Apply the patches
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Patron/Category.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e3b68414373ee23418a6dc3ce10e859ae8fb66b8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Apr 12 10:42:30 2019 -0300
Bug 22694: Unit tests
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0e762da67092e8bd04e37908e9e1419ea16f70e3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Apr 12 13:46:04 2019 -0300
Bug 22700: Make biblio_metadata prefetchable from Koha::Biblio
This patch makes $biblio->metadata be prefetchable as the Coding
guidelines require.
A new has_one relationship is added in the Biblio schema, named as the
accessor to also convey to proposed guidelines for readability.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Biblio.t
=> SUCCESS: No regressions!
- Sign off :-D
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f76f93ecf191231036c96b17fceccf819247959f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 22 15:05:51 2019 +0000
Bug 22748: Pass userid to haspermission
Signed-off-by: Agustin Moyano <agustinmoyano at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6fa21ef939785c1fd757a4755cd9b12ed09a18a0
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 23 07:38:14 2019 +0000
Bug 22755: Fix pod in patron_emailer.pl
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f11bda813695e025a3e0f45463d7f710d82548af
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 23 07:34:41 2019 +0000
Bug 22755: Import Koha::Script into patron_emailer cronjob
Test plan:
Run patron_emailer.pl cronjob to ensure it is not broken after this
patch
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b639271a615aaf9dce0d6fc2fd0dc7e22e8cf74a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Apr 22 12:02:02 2019 -0300
Bug 22749: Make Koha::Item->hidden_in_opac respect hidelostitems
This patch makes Koha::Item->hidden_in_opac take hidelostitems into
account when performing the calculation.
To test:
- Apply the regression tests patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Item.t
=> FAIL: Tests fail because the code doesn't (yet) care about the
syspref
- Apply this patch
- Run:
k$ prove t/db_dependent/Koha/Item.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6f4565ce686919ada0bc95ea26497ff80e4df250
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Apr 22 11:54:21 2019 -0300
Bug 22749: Regression tests for Koha::Item->hidden_in_opac
This patch introduces regression tests for Koha::Item->hidden_in_opac to
verify it is not considering the hidelostitems syspref when determining
if an item should be hidden (per policy) in the OPAC.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Item.t
=> FAIL: Tests fail!
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b78bd2faec703bb7d7c750dbc1070ba2449f29a9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 19 06:49:48 2019 +0000
Bug 22735: Resolve internal server error on missing item type
Trivial fix, similar to opac-detail, applied to ISBD and MARC detail.
Test plan:
Enable ArticleRequests pref.
Make sure you have a biblio with no item type in 942c. (Perhaps you need to
make 942c not mandatory temporarily and save a biblio record without this
field being filled.)
If you are logged in, log out.
Go to MARC or ISBD detail page. No crash anymore?
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d8a759162cde8f373ea945a7e509102ec81878e0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 23 14:17:58 2019 +0000
Bug 22679: Delete related CirculationRules when Removing IssuingRule
Unfortunately, the tables here can't use a foreign key as one table uses null where the other uses
'*' This patchset alters the delete method so delete related rules. It is somewhat of a workaround until
all the columns in issuingrules are moved to circulation_rules
To test:
1 - Add some issuing rules in koha, making sure to set maxissueqty
2 - Check the DB: SELECT * FROM circulation_rules;
3 - note some circulation rules were created
4 - Delete your rules via the staff interface
5 - Check the DB, the circulation rules remain
6 - Apply patch
7 - Repeat
8 - Huzzah! The rules delete!
9 - Prove the tests, read the code
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d9ce1567937de5fe115ec8595db63b7cfe80d8d6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 23 16:18:51 2019 +0000
Bug 22759: Fix wrong check of branch rule in C4::Circulation::TooMany
The condition in TooMany applied branch limits only if the rule didn't have a branchcode, this was wrong
To test:
1 - Find a title in the catalog, add 8 items, all of a single itemtype, 4 for branch A, four for branch B
2 - Remove any specific circ rules
3 - Set a default circ rule for the itemtype used above, limiting the max issue quantity to 3
4 - Find a patron and checkout the items from branch A
5 - You should be allowed to checkout 3, but the fourth should trigger 'too many'
6 - Now checkout the items from branch B, again you can checkout 3 and not four
7 - Apply this patch
8 - Assuming you have 6 items out now, try one from either branch, you should trigger 'too many' and have 6
9 - Return two from branch B and one from branch A
10 - Now you have three items issued total
11 - An item from either branch should be refused now
12 - Test with different values of 'CircControl' and confirm your expectations are met
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6d9839d800ac8334a902cba5917b878507f8ba18
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 23 16:17:20 2019 +0000
Bug 22759: Unit tests
To test:
1 - Apply only this patch
2 - prove -v t/db_dependent/Circulation/TooMany.t
3 - It fails
4 - Apply second path
5 - repeat
6 - All green!
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 22deca9445cb02320a04abb69febc9ef83d4d58f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 18 16:35:03 2019 +0000
Bug 22501: (follow-up) Use raw filter for course note on details page
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 6 +-
Koha/Biblio.pm | 12 +-
Koha/CirculationRules.pm | 15 +
Koha/IssuingRule.pm | 23 +-
Koha/Item.pm | 4 +
Koha/Patron/Category.pm | 19 +
Koha/Schema/Result/Biblio.pm | 7 +
admin/smart-rules.pl | 8 +-
cataloguing/addbiblio.pl | 2 +-
.../intranet-tmpl/prog/en/includes/accounts.inc | 8 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 26 +-
.../prog/en/modules/circ/circulation.tt | 1759 ++++++++++----------
.../prog/en/modules/members/moremember.tt | 37 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 13 +
.../bootstrap/en/includes/account-table.inc | 8 +-
.../bootstrap/en/modules/opac-course-details.tt | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 12 +
misc/cronjobs/patron_emailer.pl | 3 +-
opac/opac-ISBDdetail.pl | 84 +-
opac/opac-MARCdetail.pl | 5 +-
t/db_dependent/Circulation/TooMany.t | 196 ++-
t/db_dependent/Koha/Biblio.t | 23 +-
t/db_dependent/Koha/CirculationRules.t | 9 +-
t/db_dependent/Koha/IssuingRules.t | 41 +-
t/db_dependent/Koha/Item.t | 15 +-
t/db_dependent/Koha/Patron/Category.t | 24 +-
26 files changed, 1382 insertions(+), 979 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list