[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.09-32-ga981f63
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 21 12:49:16 CEST 2018
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, 17.11.x has been updated
via a981f630dd1c1a4e9a0ef80291556f89fdb1b1a0 (commit)
via b7ca04b769939fce9ace24c456963f456f0fcbae (commit)
via 4a0708dd3703d2b605b52438adaac72180e830be (commit)
via fe4d3d500622e81d5c7ad384b898b4c677bd096c (commit)
via 3908248f58f105c15eba34b4018d00ccfe78b6aa (commit)
via ac56eda00a0dee49d90c0fb7f41d48d96f126b78 (commit)
via 06a44d405dc939a051cda83a4a0106261af82ef7 (commit)
via 80a38c96ea11643172b71d816317a2b9c762971c (commit)
via 08213ef3e3f564d1fe5bedbb08c528c6dd6c21c7 (commit)
via 60355e225330a902a979883cba9e989ce74f2259 (commit)
via 6842bc0c47f27150b3cba7f27942d6d061c38935 (commit)
via bc0cfb7d58bac2f954767e798fd3ee0432328806 (commit)
via 6af5e209a0af68883af1dfe7d36365097d1466d8 (commit)
via 45cca9d1f2b137b5c597bacaf8ef19eb8b1ad5c0 (commit)
via 0df11d446c284a26ef09b5719794bc0bbf542c16 (commit)
via d38fbd4c87a6f9c654f4ecebaa52ae41fedb706a (commit)
via 34f65071857cbb7027b7b1bbfc7769ca64cf7a07 (commit)
from c110912af3f4ff5f41eea4668d38863a951d82c0 (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 a981f630dd1c1a4e9a0ef80291556f89fdb1b1a0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 31 12:14:54 2018 -0300
Bug 21056: Add another flush later
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5abcd3312adc02a14465a0781f735b8494d60f42)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 88a2c8886c4cf37e6dff00cffd26674d6ac548e2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b7ca04b769939fce9ace24c456963f456f0fcbae
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jul 9 14:05:29 2018 -0400
Bug 21056: Changing the logged in library can fail sporadically
We are getting reports that sometimes changing the logged in library via selectbranchprinter.pl sometimes appears to fail. Flushing the session after updating the branch appears to fix this.
Test Plan:
1) Change your logged in library repeatedly. Hopefully ( sort of ) it will fail to change.
You may want to try various browsers.
2) Apply this patch
3) Note the change no longer fails
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 76a06a7050643add32f4cbccbdc2fb00f66f5485)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0a5dabc27174d5b77783f81c59248f5da8b37c79)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4a0708dd3703d2b605b52438adaac72180e830be
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 2 13:46:31 2018 +0000
Bug 21148: Dropdowns styled by the Select2 plugin do not highlight missing required fields
This patch adds some CSS to target mandatory fields on the add item
screen which are styled by the Select2 plugin.
To test you must have at least one item field marked mandatory and
linked to an authorized value.
Open the add item form for an existing record. Try to submit the form
without making a selection in the mandatory dropdown. You should get an
alert warning you that you have empty mandatory fields, and the field
should be highlighted in yellow.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 62aacb5865719e27224bf8f1963de1888d2ca05d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 9bb74effa31053c685902df48714a61c18d3c6d9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit fe4d3d500622e81d5c7ad384b898b4c677bd096c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 15:13:31 2018 +0000
Bug 21075: Unit tests
prove -v t/db_dependent/Reserves/AutoUnsuspendReserves.t
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6e5865ee4feaca3ca5575ce45d11fc88d88dc43d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 77f2da8fb26e68fa87d2858fc1dfc9f223e24821)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3908248f58f105c15eba34b4018d00ccfe78b6aa
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 14:45:55 2018 +0000
Bug 21075: AutoUnsuspendHolds should unsuspend holds <= today
To recreate:
1 - Place a hold in your system
2 - Set that hold (or all holds) to expire today
update reserves set suspend_until=CONCAT( CURDATE()," 00:00:00");
3 - Run misc/cronjobs/holds/auto_unsuspend_holds.p
4 - Note the hold is sitll suspended
5 - Visit /cgi-bin/koha/reserve/request.pl for the book with the hold
6 - Note the suspend date is tomorrow (and cannot be set to today]
7 - Click update holds - the date in db is now set to tomorrow
8 - Reset to today
9 - Apply patch
10 - Run the cron again
11 - Visit the page and note hold is unsuspended
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c0f7aed84d663029b2f1b37ce0391b5a40b10b97)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 9e67cff276297fe52e2f8c58ab559758ad5043f6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit ac56eda00a0dee49d90c0fb7f41d48d96f126b78
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 15 14:21:47 2018 -0300
Bug 21139: (follow-up) Floating toolbars - Remove unecessary height
Found where QAing bug 20935, we actually want the hidden toolbar to be
the exact same height as the visible one.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 592905a4d2d41a1a7b757c48fbac8fc6f025bf9b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 514939a8046cb82a66cfb3966a14020e846face3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 06a44d405dc939a051cda83a4a0106261af82ef7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 13:18:47 2018 -0300
Bug 21139: No table in toolbar
We do not need this selector, we will not have a table in the toolbar
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>
(cherry picked from commit 40577065b60ab87330f1fc0c3e6bbe52f2373e6c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 71adb4380c101b10ddbda95be32806052e75d0d0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 80a38c96ea11643172b71d816317a2b9c762971c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:34:29 2018 -0300
Bug 21139: Floating toolbar - Resize toolbar on window resize
Prior to this patch the toolbar was not resized when the window was
resized
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>
(cherry picked from commit 5ecf4da7d49357832b77ee087d968e071ab46b93)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5eecc789af216e56638525961a8c25dd9677c9db)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 08213ef3e3f564d1fe5bedbb08c528c6dd6c21c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:31:01 2018 -0300
Bug 21139: Floating toolbar - Remove horizontal scrollbar on resize
To test:
- add/edit a patron
- resize the window
=> Without this patch a horizontal scrollbar appears when resized
shorter
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>
(cherry picked from commit b5520f3e019f38cbd2ea75be0a13806f68a2f515)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 106ad2d6f01e6bdcf79b54791a437ae31746a059)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 60355e225330a902a979883cba9e989ce74f2259
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:28:54 2018 -0300
Bug 21139: Floating toolbars - Remove unecessary height
This patch remove some pixels under the toolbar, they were used by the
hidden element.
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>
(cherry picked from commit 2588811ef249f0996527e952e4ef5307c1834a71)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 3d0d2a35585b6563148178d41545db09dcc8c007)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6842bc0c47f27150b3cba7f27942d6d061c38935
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 12:28:37 2018 -0300
Bug 21139: Floating toolbar - Remove dup id
We should not have twice the same id, we always use fixFloat() on an
element with an id and then duplicate this element.
The id must be changed (just in case)
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>
(cherry picked from commit 77196e91402cdb59242f80e596f1812d238923c2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit af2ccb13e3001f388a320a0619e22871429e09b5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit bc0cfb7d58bac2f954767e798fd3ee0432328806
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 20 12:59:16 2018 -0300
Bug 21099: Reposition floating toolbars earlier
To recreate:
- Go to the advanced search form
- scrolldown to position the toolbar on top of the window
- scrollup
https://screenshots.firefox.com/NnkFg3iOXqLPxfkd/pro.kohadev.org
The toolbar should have been repositioned earlier
Test plan:
Edit a patron
- scrolldown
- scrollup
- unfold the form in the header (tab "Search patrons", link "[+]")
- scrolldown
- scrollup
Advanced search
scrolldown
scrollup
You should notice the difference with and without this patch
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 68e735b10151d7b70187fa7f9d4ecb2b94b34e6a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0d349fba89697bf58d86a9b26d8ebc385d1a8417)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6af5e209a0af68883af1dfe7d36365097d1466d8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 27 09:42:06 2018 +0200
Bug 21048: (QA follow-up) Fix authorized value statuses in filter
If you select an authorized value status in the filter, you want to keep
it too just like normal statuses as CHECKED.
The variable selected_status was not filled. The minimal fix is adding that
template variable in the script. Note that suggestion.STATUS is out of scope
within a loop using suggestion as loop var.
Note: Adding a regular status like CHECKED as an authorized value with
same code but another description works, but is kind of confusing ;) Not
in the scope of this report though.
Test plan:
Select an authval status in the filter. Apply the filter and verify again
that it is still selected under Suggestion information.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b1e8193a84a8df6d70ad8de16dadb8c4301a706b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f5121183d9049a82645797e18028d600e11a2476)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 45cca9d1f2b137b5c597bacaf8ef19eb8b1ad5c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 18:23:49 2018 -0300
Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS)
When a suggestion's status is set to a customized value (AV
SUGGEST_STATUS), the description is not always displayed correctly.
Test plan:
- Create different values for the AV SUGGEST_STATUS
- Create several suggestions
- Change the status using the SUGGEST_STATUS values
- Edit the suggestion and change again the status
- View the suggestions for a given patron
(members/purchase-suggestions.pl?borrowernumber=XX), the statuses must
displayed correctly
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b25c063f950076234cf7bb4a496921983a7cc23f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e81fdb07c68fb80bc497190dfd2dd15f24491447)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0df11d446c284a26ef09b5719794bc0bbf542c16
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jul 3 19:04:50 2018 +1000
Bug 21031: Apache Rewrite rules don't work for API when using anything but Debian package Plack configuration
The Rewrite rules for Apache don't work unless you're using
debian/templates/apache-shared-opac-plack.conf or
debian/templates/apache-shared-intranet-plack.conf.
This patch fixes the Rewrite rules for the non-Plack Debian
Apache configuration templates as well as the standard
Apache configuration file that comes with Koha.
__BEFORE APPLYING__
1. Visit /api/v1/app.pl/api/v1/spec on your git dev install
2. This should display a large page of JSON
3. Visit /api/v1/spec on your git dev install
4. This should generate a 404 error
__APPLY PATCH__
__AFTER APPLYING__
5. Visit /api/v1/app.pl/api/v1/spec on your git dev install
6. This should display a large page of JSON
7. Visit /api/v1/spec on your git dev install
8. This should display a large page of JSON (identical to
the one from earlier steps)
Signed-off-by: Ere Maijala <ere.maijala at helsinki.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Passed QA with few notes posted separately to Bugzilla.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit c6b50f0bac092779f93033c8a3f002cb8722d7d4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 11b6ad197ab279aca89944001a9751a492bdb573)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d38fbd4c87a6f9c654f4ecebaa52ae41fedb706a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 19 16:57:42 2018 +0000
Bug 21094: Syndetics: always use https instead of http
This patch removes the 'using_https' check in OPAC templates in calls to
Syndetics resources. Instead, https is always used.
To test, apply the patch and enable Syndetics-related preferences. View
the following pages in the OPAC:
- Bibliographic detail page
- Browse shelf section of the bibliographic detail page
- Search results
- List contents
- Recent comments
- Recent comments RSS
- User summary page
- Circulation history
NOTE: I tested with made-up Syndetics credentials. This means my changes
didn't make the template explode, but it doesn't confirm conclusively
that the resources work.
Signed-off-by: John Doe <you at example.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 6e0548cc1a7a924731bd414fec2f7917f044040a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 40cf253a0df46613340b301a8ce600de2e680a1c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 34f65071857cbb7027b7b1bbfc7769ca64cf7a07
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jul 15 19:27:03 2018 +0200
Bug 21077: Fix database documentation for statistics.type
There's a typo for 'locause', this should be 'localuse'.
Also, 'Credit*' is never used.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 0b89cbf6a473e71597bc051d88c2152531648ad8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit dc490f7d86c182047a55f875d0db9081fe974996)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 2 +-
circ/selectbranchprinter.pl | 2 +
debian/templates/apache-shared-intranet.conf | 6 +--
debian/templates/apache-shared-opac.conf | 6 +--
etc/koha-httpd.conf | 13 ++---
installer/data/mysql/kohastructure.sql | 2 +-
.../lib/jquery/plugins/jquery.fixFloat.js | 31 ++++++-----
koha-tmpl/intranet-tmpl/prog/css/select2.css | 4 ++
.../en/modules/members/purchase-suggestions.tt | 23 +++++---
.../prog/en/modules/suggestion/suggestion.tt | 2 +-
.../bootstrap/en/includes/shelfbrowser.inc | 6 +--
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 44 +++------------
.../bootstrap/en/modules/opac-readingrecord.tt | 6 +--
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +--
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 6 +--
.../bootstrap/en/modules/opac-showreviews-rss.tt | 6 +--
.../bootstrap/en/modules/opac-showreviews.tt | 6 +--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 +----
suggestion/suggestion.pl | 7 ++-
t/db_dependent/Reserves/AutoUnsuspendReserves.t | 57 ++++++++++++++++++++
20 files changed, 132 insertions(+), 115 deletions(-)
create mode 100644 t/db_dependent/Reserves/AutoUnsuspendReserves.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list