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 5bad8da970b299588b49ca061555e1633f95a6fe (commit)
via e1509855d3aa2729127ac352525be62505d752f9 (commit)
via c7ae33f60c18d2874370e7c2d2f3042fe1331e0e (commit)
via 09146f4a995d50206c7f1c2d80e797b3cb1175c5 (commit)
via 759e52ac944d25cf019b83a68ea0329842e4d3e2 (commit)
via 8855908fdf8839878a233012f4d63b33949554c0 (commit)
via b6cb3c2ba54c0e10c27f37a0d2dec4f2875f2ddd (commit)
via 1ae7efa3bb7806ac5a7e3f2882a7139e627b22c6 (commit)
via ff4917197deaa6250d30c5729b2758db2b1f755e (commit)
via e0624f0e03e8d265cd3f2ab8434671700bf6984d (commit)
via bb0abf99c451113e8649c494d3a8b99f3916f942 (commit)
via 6d1c3af91bec4e5f93f6531be3aa8de4c4608efe (commit)
via 550cb7eb431fe90c9cd1d7f9f711f617d0befe6e (commit)
via 6a55ca6a82a662966e47921e13029a91152fbefd (commit)
via 2b5f66ddbb9b556933baedd6f471b97eca713d8d (commit)
via 19d8aea4e04d64426493c16681dfa662313e4cee (commit)
from e4cae99f7ec76e40a57e4066e088b9b01caed744 (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 5bad8da970b299588b49ca061555e1633f95a6fe
Author: Owen Leonard <[email protected]>
Date: Mon Jul 27 12:26:41 2020 +0000
Bug 26037: openlibrary.org is hit on every Koha requests
This patch moves the inclusion of Open Library JavaScript from
opac-bottom.inc to the three templates where it might be used.
In addition, the Open Library JS has been modified to check for the
existence of the relevant markup on the page before executing a query.
Unrelated: The Open Library label is now hidden when the status returned
is "Not found." Previously this information was displayed.
To test, apply the patch and enable the OpenLibrarySearch system
preference.
- Perform a search in the OPAC which will return results from Open
Library. Some ISBNs: 0140423826, 0395082552, 0679436405.
- On the search result page there should be an Open Library "Read
now" button for each result that can be opened for reading in Open
Library.
- Add these titles to a list and view the list.
- The "Read now" button should appear on the list page.
- View the details for one of these titles.
- The "Read now" button should appear on the page below the holdings.
- Watch the browser's developer tools on these and other pages in the
OPAC. There should be no errors in the console and no 404 errors in
the network tab.
Signed-off-by: Lucas Gass <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit e1509855d3aa2729127ac352525be62505d752f9
Author: Nick Clemens <[email protected]>
Date: Tue Aug 4 18:28:42 2020 +0000
Bug 25683: (follow-up) Use COALESCE instead of IFNULL
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit c7ae33f60c18d2874370e7c2d2f3042fe1331e0e
Author: Nick Clemens <[email protected]>
Date: Wed Jun 10 12:26:06 2020 +0000
Bug 25683: Fix grouping of results
DBIX doesn't seem to work as I expected - if trying to group by we can only
get the columns we grouped by, otherwise the queries are much more
complicated
and come out wrong
This patch removes the 'amountoutstanding' from the query. Note that we do
return patron
object, however, to access all the columns we must discard_changes (or
refetch)
Also fixes a typo 'verbosse'
To test:
1 - charge a $1 fine to a patron
2 - pay off the fine
3 - perl misc/cronjobs/update_patrons_category.pl -f J -t J -fu=5 -v
4 - Note the patron is returned twice
5 - export DBIC_TRACE=1
6 - repeat 3 - view the SQL query and see how odd it is
7 - Apply this patch
8 - repeat 3 - simpler query
9 - patron returned only once
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 09146f4a995d50206c7f1c2d80e797b3cb1175c5
Author: Nick Clemens <[email protected]>
Date: Tue Jun 9 10:52:26 2020 +0000
Bug 25683: Patron with no accountlines should have 0 outstanding (not NULL)
Test plan:
- Have a patron with nothing in accountlines
- run update_patron_categories to find patrons with fines under $5 (-fu=5)
- Your patron is not found
- Give your patron a manual charge of $1
- rerun the cron, your patron is found
- pay off your patron's fine, putting their balance at $0
- rerun the cron, your patron is found
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 759e52ac944d25cf019b83a68ea0329842e4d3e2
Author: Lucas Gass <[email protected]>
Date: Mon Aug 3 21:56:48 2020 +0000
Bug 26131: Remove parentheses in circulation.pref
To test:
1. Search for a SCO system preference like SCOUserJS.
2. Note that there is a console error on that screen and you cannot open
editor.
3. Apply patch
4. Reload the page.
5. No more console error and you can now edit the system pref!
Signed-off-by: Sally <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 8855908fdf8839878a233012f4d63b33949554c0
Author: Didier Gautheron <[email protected]>
Date: Mon Aug 3 08:40:06 2020 +0200
Bug 26125: (bug 23697 follow-up) open patron's details in autocompletion
search
Test plan:
1 - Enable PatronAutoComplete syspref
2 - Go to "Patrons" (members/members-home.pl)
3 - Enter a patron first letters in "Search Patron" tab
4 - Select a patron
5 - You're wrongly redirected in koha/circ/circulation.pl
6 - Apply patch
7 - Repeat 3, 4
8 - You're correctly redirected in koha/members/moremember.pl
9 - double check "Check out" redirect hasn't changed
Signed-off-by: Sally <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit b6cb3c2ba54c0e10c27f37a0d2dec4f2875f2ddd
Author: Jonathan Druart <[email protected]>
Date: Thu Jul 30 10:51:26 2020 +0200
Bug 26098: Fix JS error on the fund list view when no fund displayed
TypeError: this.data(...) is undefined
in jquery.treetable.js
Test plan:
Go to the fund list view
Select a filter that will return no result
=> With this patch applied there is no JS error in the console
Signed-off-by: Lucas Gass <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 1ae7efa3bb7806ac5a7e3f2882a7139e627b22c6
Author: Martin Renvoize <[email protected]>
Date: Tue Aug 4 15:06:02 2020 +0100
Bug 26017: (follow-up) Serverside permission check on registers page
This patch adds a serverside permissions check for the display of the
registers summary page.
Signed-off-by: Jonathan Druart <[email protected]>
commit ff4917197deaa6250d30c5729b2758db2b1f755e
Author: Martin Renvoize <[email protected]>
Date: Mon Jul 20 09:40:00 2020 +0100
Bug 26017: Correct permission check on tools page
The 'Cashup registers' link from the tools page retained an previous
verions of the permission name. This patch corrects it to use the final
name we sebtled on and thus now correctly displays the link when
appropriate.
Test plan
1/ Enable cash registers via the 'UseCashRegisters' system preference
2/ Ensure you are logged in as a user who has the cash management
cashup permission.
3/ Verify that the 'Cashup registers' option appears on the tools page.
Signed-off-by: Michal Denar <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit e0624f0e03e8d265cd3f2ab8434671700bf6984d
Author: Lucas Gass <[email protected]>
Date: Fri Jul 31 22:47:21 2020 +0000
Bug 26121: Add z-index for CodeMirror
To test:
1. Make sure the system preference 'NewsToolEditor' is set to CodeMirror
2. Go add or edit some News content.
3. Add some content to the News section
4. Use the datepicker to pick a Publication date/Expiration date
5. Notice its very hard to see your dates overlapping with CodeMirror.
6. Apply patch
7. Much easier to see the dates!
Signed-off-by: Sally <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit bb0abf99c451113e8649c494d3a8b99f3916f942
Author: Nick Clemens <[email protected]>
Date: Mon Jun 29 18:15:39 2020 +0000
Bug 25893: Use wildcards when searching logs
The restores the wildcards that were used in the past
To test:
0 - Ensure cataloguing logs and issues logs are enabled
1 - Edit an item
2 - Circulate that same item
3 - Browse to tools-> log viewer
4 - Put the itemnumber in the 'info' box
5 - You see only the circulation
6 - Put the itemnumber in the object box
7 - You see only the cataloging modification
8 - Apply patch
9 - Put itemnumber in info box
10 - you see both actions
11 - Put the itemnumber in the object box
12 - You see only the catalogiong modification
Signed-off-by: Jason Robb <[email protected]>
Bug 25893: Don't wildcard object
Signed-off-by: Katrin Fischer <[email protected]>
Bug 25893: (follow-up) Undo unrelated changes
Signed-off-by: Jonathan Druart <[email protected]>
commit 6d1c3af91bec4e5f93f6531be3aa8de4c4608efe
Author: Lucas Gass <[email protected]>
Date: Tue Aug 4 02:59:32 2020 +0000
Bug 26124: Load TinyMCE assets in correct order
1. Make sure NewsToolEditor is set to TinyMCE
2. Go to Home › Tools › News › Add news item
3. Observe console error
4. Apply patch
5. No console error
Signed-off-by: Sally <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 550cb7eb431fe90c9cd1d7f9f711f617d0befe6e
Author: Tomas Cohen Arazi <[email protected]>
Date: Fri Jul 31 10:17:01 2020 -0300
Bug 26115: Remove leftover Carp::Always
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 6a55ca6a82a662966e47921e13029a91152fbefd
Author: Jonathan Druart <[email protected]>
Date: Thu Aug 6 11:36:33 2020 +0200
Bug 25871: DBRev 20.06.00.021
Signed-off-by: Jonathan Druart <[email protected]>
commit 2b5f66ddbb9b556933baedd6f471b97eca713d8d
Author: Nick Clemens <[email protected]>
Date: Tue Aug 4 00:49:35 2020 +0000
Bug 25871: (QA follow-up) Update syspref
Signed-off-by: Jonathan Druart <[email protected]>
commit 19d8aea4e04d64426493c16681dfa662313e4cee
Author: Owen Leonard <[email protected]>
Date: Tue Jun 16 21:34:52 2020 +0000
Bug 25871: Add "only library" to OpacItemLocation options
This patch adds a new option to the OpacItemLocation system preference,
"only library." It also rewords the descriptions of the existing options
in order to make their use more clear.
To test, apply the patch and make sure your OPACXSLTResultsDisplay
system preference is set to "default."
Test the OPAC search results using each of the OpacItemLocation
preference options:
- location: "library, location, and call number," e.g.
"Availability: Items available for loan: Athens (1).
Location(s): Athens new book shelf Call number: JNF 952.025 Bl."
- ccode: "library, collection code, and call number," e.g.
"Availability: Items available for loan: Athens (1).
Collection(s): Juvenile non-fiction Call number: JNF 952.025 Bl."
- callnum: "library and call number," e.g.
"Availability: Items available for loan: AthensCall number: JNF
952.025 Bl (1)."
- library: "only library," e.g."
"Availability: Items available for loan: Athens (1)."
Signed-off-by: Amit Gupta <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Patrons.pm | 6 +-
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 9 ++
.../intranet-tmpl/prog/en/includes/js_includes.inc | 2 +-
.../prog/en/modules/admin/aqbudgets.tt | 126 +++++++++++----------
.../en/modules/admin/preferences/circulation.pref | 4 +-
.../prog/en/modules/admin/preferences/opac.pref | 7 +-
.../prog/en/modules/tools/koha-news.tt | 3 +-
.../prog/en/modules/tools/tools-home.tt | 6 +-
.../bootstrap/en/includes/opac-bottom.inc | 14 +--
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 3 +
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 7 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 6 +-
koha-tmpl/opac-tmpl/bootstrap/js/openlibrary.js | 25 ++--
misc/cronjobs/update_patrons_category.pl | 9 +-
pos/registers.pl | 1 +
t/db_dependent/Illrequests.t | 1 -
t/db_dependent/Patrons.t | 9 +-
tools/viewlog.pl | 5 +-
21 files changed, 139 insertions(+), 112 deletions(-)
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
[email protected]
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
