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 2b56ae1d4a231a83f52420ec9efc4829226fa86a (commit)
via a21a3bba6b23beed7aef9852f7c82efbfc1c3c1e (commit)
via 00a12f548b4336f6c6eae8ce30e7c6cfaf7ed05c (commit)
via 00f04146e915b2b1a9881439ac34088e6486921f (commit)
via 6b9572e0c8fb9f1ad1e60ed5db50e69c60ac1a00 (commit)
via 2fbe775070637ebdddcc9ea0b455e80dbb85a83d (commit)
via f058e63b5ae573469ea21777b76b822afd8a3442 (commit)
via 312dd03223fbce83c77315250af9f1fc9ee0d4a1 (commit)
via 7bb31cffae27dc398a7b4a4decf3623ec65478ac (commit)
via e441cb35fb13670e65b9437706561c17d1311945 (commit)
via f77a377c939080eed36401746b5d722c91ee964b (commit)
via 7b84fda33b23347846ae50016f1e4b38b0fd95f4 (commit)
via 56220d211d7b5c4e2622787f9ea38ab12c8868f5 (commit)
from 981b601c39e97e23d309fe342c00a819a9ee8ad6 (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 2b56ae1d4a231a83f52420ec9efc4829226fa86a
Author: Didier Gautheron <[email protected]>
Date: Tue Apr 28 07:43:46 2020 +0200
Bug 25293: Don't call escapeHtml on null
Test Plan:
1) Create two Checkouts
2) view patron's checkout list
cgi-bin/koha/members/moremember.pl?borrowernumber=pp <show
checkout>
3) in mysql shell delete a checkout home branch: update items set
homebranch = null where itemnumber = xx;
4) view patron's checkout list, again
Without this patch the list is empty.
Same if biblio title is null (update biblio set title = null where
biblionumber = yy;).
Javascript error:
TypeError: oObj.title is null
Signed-off-by: Owen Leonard <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit a21a3bba6b23beed7aef9852f7c82efbfc1c3c1e
Author: Slava Shishkin <[email protected]>
Date: Mon Jun 29 22:26:42 2020 +0300
Bug 25896: Add missing closing </td> tag
File koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt had
one lost closing </td> tag in "daysmode" block. Added.
Mentored-by: Andrew Nugged <[email protected]>
Signed-off-by: Owen Leonard <[email protected]>
Signed-off-by: Marcel de Rooy <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 00a12f548b4336f6c6eae8ce30e7c6cfaf7ed05c
Author: Owen Leonard <[email protected]>
Date: Fri Jul 10 14:30:09 2020 +0000
Bug 25974: Remove inline style from table settings administration page
This patch removes an inline style attribute from the table settings
administration template. A different style is added to the page's
<style> block to try to accomplish a similar effect of expressing the
hierarchy of the page.
To test, apply the patch and go to Administration -> Table settings.
The individual tables of settings should be offset from the headings
above them.
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 00f04146e915b2b1a9881439ac34088e6486921f
Author: Owen Leonard <[email protected]>
Date: Tue Jul 14 21:30:39 2020 +0000
Bug 25987: Fix alignment of fields in label batch creation form
This patch makes minor markup changes to the template for the label
batch creation process so that form fields line up correctly.
Unrelated change: A hint has been moved out of the label area to below
the textarea in order to conform with established patterns.
To test, apply the patch and go to Tools > Label creator > New > Label
batch.
- In the batch creation form the "Enter by itemnumber" and "Enter by
barcode" should be aligned correctly with each other.
- The "One number per line..." hint should appear below the textarea.
- Test that the form fields are still correctly aligned after adding
some items to the batch and the "description" field is shown in the
form.
Works for me!
Signed-off-by: Caroline Cyr La Rose <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 6b9572e0c8fb9f1ad1e60ed5db50e69c60ac1a00
Author: Lucas Gass <[email protected]>
Date: Tue Jan 21 17:53:09 2020 +0000
Bug 24473: Add $raw filter for Syndetics content
Syndetics offers enhanced content in the OPAC under the tabs 'Title Notes',
'Excerpt', 'About the author', 'Editions'. They provide this info as HTML
therefore we should filter it as $raw so the content shows up without the
markup.
Signed-off-by: Stina Hallin <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 2fbe775070637ebdddcc9ea0b455e80dbb85a83d
Author: Didier Gautheron <[email protected]>
Date: Wed Jun 24 16:03:16 2020 +0200
Bug 25862: Prevent TinyMCE to mangle local url links
To test:
1 create a report 1 if it doesn't exist
2 open /cgi-bin/koha/tools/koha-news.pl
3 create a news
4 add a HTML link with Insert/Edit link tinyMCE dialog box to
/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Run%20this%20report
"report 1"
5 save
6 on the main page "report 1" link returns a 404 error
Apply patch
7 Modify news' URL
8 Test it works in: tools/koha-new.pl admin/branches.pl and
admin/preferences.pl
Signed-off-by: Lucas Gass <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit f058e63b5ae573469ea21777b76b822afd8a3442
Author: Jonathan Druart <[email protected]>
Date: Mon Jul 20 12:57:00 2020 +0200
Bug 24379: DBIC schema changes
Signed-off-by: Jonathan Druart <[email protected]>
commit 312dd03223fbce83c77315250af9f1fc9ee0d4a1
Author: Jonathan Druart <[email protected]>
Date: Mon Jul 20 12:53:43 2020 +0200
Bug 24379: DBRev 20.06.00.005
Signed-off-by: Jonathan Druart <[email protected]>
commit 7bb31cffae27dc398a7b4a4decf3623ec65478ac
Author: Nick Clemens <[email protected]>
Date: Wed Jan 8 20:59:38 2020 +0000
Bug 24379: Make login_attempts not nullable
While the column defaults to 0 in Koha::Object->store we set to NULL if
NULLABLE
When trying to reset a patrons password we check that the account is not
administratively locked:
login_attempts != -1
This query does not return rows where login_attempts IS NULL. It will
return accounts where login_attempts = 0
Let's default to 0 like we intend
To test:
1 - Create a new patron
2 - Note their login_attempts is NULL
SELECT login_attempts FROM borrowers ORDER BY borrowernumber DESC LIMIT
1
3 - Enable OpacResetPassword
4 - Attempt to reset password before logging in, you cannot
5 - Apply patch, updatedatabase, restart_all, update schema
6 - Create another patron
7 - Their login attempts should be 0
8 - Attempt to reset password, it works!
Bug 24379: Fix the test
First we create a patron using TestBuilder to get a hashref of valid
info. Then we delete it and create a new patron using Koha::Patron->new
Once stored, we should call discard_changes to make the calculated
values available in the currenct object.
Bug 24379: Don't drop default of 0 for login attempts
When moving the column we drop the default, this means that DBs upgraded
form earlier versions
get the wrong values set
To test:
1 - Checkout 16.11.x
2 - Reset all
3 - Checkout master
4 - updatedatabase
5 - SHOW CREATE TABLE borrowers;
6 - Note the column login_attempts defaults to NULL
7 - Apply patch(es)
8 - Repeat
9 - Now it defaults ot 0 (and has NOT NULL if applied all)
Signed-off-by: Lucas Gass <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit e441cb35fb13670e65b9437706561c17d1311945
Author: Fridolin Somers <[email protected]>
Date: Wed Jun 24 17:05:30 2020 +0200
Bug 25868: Fix transfers page to show effective itemtype
In transfers page /cgi-bin/koha/circ/branchtransfers.pl :
Itemtype is always from biblioitems.itemtype, regardless of system
preference item-level_itypes.
Patch also changes template to use the object Koha::Item.
Patch also fixes a small typo : closed <form> tag.
Test plan :
1) Test with both values of system preference 'item-level_itypes'
2) Go to Circulation > Transfert
3) Enter a barcode
4) Enter another barcode
5) Check you see in table all datas and that 'Item type' is correct
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit f77a377c939080eed36401746b5d722c91ee964b
Author: Nick Clemens <[email protected]>
Date: Wed Jun 24 16:17:19 2020 +0000
Bug 25869: Fix Coce display for lists
To test:
1 - Enable Coce for Opac
CoceHost: https://coce.bywatersolutions.com
CoceProviders: Select all
OpacCoce: Enable
2 - Do a search on the Opac, confirm you see some covers
3 - Add some of the items with covers to a public list
4 - View the public list
5 - Note no covers display
6 - Apply patch
7 - Success!
Signed-off-by: Owen Leonard <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 7b84fda33b23347846ae50016f1e4b38b0fd95f4
Author: David Cook <[email protected]>
Date: Wed Jul 8 07:10:50 2020 +0000
Bug 25950: Remove <client> in X-Forwarded-For from proxy tests
This patch removes the <client> ip address in the X-Forwarded-For
header from being tested against koha_trusted_proxies.
Without this patch, REMOTE_ADDR will be set to null, if the <client>
ip address matches against koha_trusted_proxies.
To Test:
1. Run the unit test t/Koha/Middleware/RealIP.t
Signed-off-by: Didier Gautheron <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 56220d211d7b5c4e2622787f9ea38ab12c8868f5
Author: Andrew Fuerste-Henry <[email protected]>
Date: Fri Jun 12 13:51:16 2020 +0000
Bug 25726: make holds to pull ignore holds where found is not null and
itemnumber is null
To test:
1- place 2 bib-level holds on available items
2- confirm they both show on Holds to Pull
3- edit one hold from the database to set found='T'
4- reload Holds to Pull, confirm it is now empty
5- apply patch
6- Reload Holds to Pull
7- confirm it now shows the hold you did not edit
Signed-off-by: donnab <[email protected]>
Signed-off-by: Marcel de Rooy <[email protected]>
[EDIT] Using capitals for SQL reserved words; added a FIXME
Tested with:
update reserves set found='T', itemnumber=NULL where reserve_id=...
This should be a workaround while we fix the underlying problem.
Signed-off-by: Jonathan Druart <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Middleware/RealIP.pm | 3 +-
Koha/Schema/Result/Borrower.pm | 8 +-
Koha/Schema/Result/Deletedborrower.pm | 8 +-
circ/branchtransfers.pl | 44 ++----
circ/pendingreserves.pl | 4 +-
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 13 +-
.../prog/en/includes/wysiwyg-systempreferences.inc | 1 +
.../prog/en/modules/admin/branches.tt | 1 +
.../prog/en/modules/admin/columns_settings.tt | 6 +-
.../prog/en/modules/admin/smart-rules.tt | 1 +
.../prog/en/modules/circ/branchtransfers.tt | 28 ++--
.../prog/en/modules/labels/label-edit-batch.tt | 23 ++--
.../prog/en/modules/tools/koha-news.tt | 1 +
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 14 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 10 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +-
t/Koha/Middleware/RealIP.t | 152 +++++++++++++--------
t/db_dependent/Koha/Patron.t | 21 ++-
20 files changed, 209 insertions(+), 139 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
