[koha-commits] main Koha release repository branch master updated. v20.05.00-544-g6921916924
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 7 17:24:11 CEST 2020
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 692191692429661e5b6a35a5e8198976c4f73cdc (commit)
via 0e440c07bd5d574e3202cb94846fe5d898fe0a0d (commit)
via 9d2b53c1b84cedbf264c9edf82b51f808396e1ac (commit)
via 6a525c1cf702c6b90a0d7ab06eb50156d5e1d2ed (commit)
via 82817e808fcc06aad887430548af2071a4848796 (commit)
via e9b051baf7b92ab7482b74f8308298f2a151c198 (commit)
via 16979c2afc45377bd2a4dcc3c50b3d2fa6771026 (commit)
via f2572c0e0233927d56c1cf29ecac1eff75a025cb (commit)
via 8f726d334085636146ae7bad56242e6129dcc493 (commit)
via 9d1ba3487d167bda878069c9f0269ebba64ab30d (commit)
via d79a19d3a0c32bd40279f138c3ca367042c290f9 (commit)
via 45e1f325d590aaf8c46513d5eef0bd17e31d804c (commit)
via ad9fdd792a4433d2ea5ea58a081f036d4230fdb8 (commit)
via 1f96bea8bab9d2c259ef354bca5c554c351c5403 (commit)
via 50e1f1abc1e1e9bb7294194aeba480f0441bd4b2 (commit)
via a02e9e3d9107e4ae4b2a03128d53c786766d2582 (commit)
via 4163f24014addb4cc5fddbb854f84617ffffb988 (commit)
via 2d7fd8c09265880bf7ec548877569d698d14cdbb (commit)
via 876d95285ef06224b0d50249b7096b55abff400d (commit)
via 1cee6b7025e42c4e69d7dca0f4c852c66c939e36 (commit)
via 3fc961b7c263a74da4759c70a3acff00eee71ec1 (commit)
via df0ef02de5e4efe23aafab77e25d0e19f658151c (commit)
via f74ab4e9de75b53dc7040814b1f25ae282a81106 (commit)
via 3abc4fb8584e0df2b71dd9d38f033e34b205e829 (commit)
via 0a40f71075c7dff1d9a99ab66b4210849c506648 (commit)
via 5cf05ff53d7284500a2653f7b0988d6a46a7ea13 (commit)
via 27ff36825dd6ac8f87dc7d380c60f21e8170dea6 (commit)
via e7661a37e657141b994d74398dd8e1b96d1da117 (commit)
via d08ce1d9406feca7bc7e5ab0be58efea94c7a2e5 (commit)
via 4dd1672c1b2f15e0b6be6071b6915c927c3a2ecc (commit)
via 44f54aac602ae99d83d954a2f102d77ff93ecfa7 (commit)
via 85005b719876071047e4f6b99321549b665bcc05 (commit)
via a96433446e87c03ac6e253a54eb067ac93a33575 (commit)
via fd94f11afb5af5fc051ac75f3804cb9ea38fc677 (commit)
via b0c47ad824e5bbfeb119558b7221df50b36a8ae4 (commit)
via 2a1406c4766e43460dd3bf8c99c0636b51e9c7c4 (commit)
from 5bad8da970b299588b49ca061555e1633f95a6fe (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 692191692429661e5b6a35a5e8198976c4f73cdc
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 7 15:38:54 2020 +0100
Bug 24201: (QA follow-up) Replace library select
Removing the library select entirely results in a JS failure for desk
selection when independant branches is enabled and the user does not
have permission to select a library.
This patch adds a hidden select element so we can still grab the current
branch from the selection.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0e440c07bd5d574e3202cb94846fe5d898fe0a0d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 7 15:20:55 2020 +0100
Bug 24201: (QA follow-up) Make logic consistent
The display logic for the desk details in the header bar was
inconsistent between the narrow display view and the full width display
view. This patch updates the former to match the latter.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9d2b53c1b84cedbf264c9edf82b51f808396e1ac
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 7 13:37:30 2020 +0100
Bug 24201: (QA follow-up) IndependentBranches
This patch updates the IndependentBranches template display logic such
that the 'Select desk' and 'Select library and desk' options appear
correctly when IndependentBranches is enabled.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6a525c1cf702c6b90a0d7ab06eb50156d5e1d2ed
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Aug 7 11:47:39 2020 +0100
Bug 24201: (QA follow-up) Add 'and desk' to menus and title
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 82817e808fcc06aad887430548af2071a4848796
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Aug 5 05:04:18 2020 +0000
Bug 24201: (QA follow-up) Another capitalization fix
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e9b051baf7b92ab7482b74f8308298f2a151c198
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Aug 4 12:49:54 2020 +0100
Bug 24201: (QA follow-up) Correct call to set_userenv
One call to set_userenv had been implimented incorrectly with the
parameters out of order.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 16979c2afc45377bd2a4dcc3c50b3d2fa6771026
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Aug 4 12:30:03 2020 +0100
Bug 24201: (QA follow-up) Capitalisation fix
'Set desk' vs 'Set Desk'.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f2572c0e0233927d56c1cf29ecac1eff75a025cb
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Aug 4 12:28:44 2020 +0100
Bug 24201: (QA follow-up) Only display desks picker if enabled
I missed a case on the authentication page with the prior patch of the
same name.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8f726d334085636146ae7bad56242e6129dcc493
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Aug 3 07:41:47 2020 +0000
Bug 24201: (QA follow-up) Make desk and branch selects on login page consistant
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9d1ba3487d167bda878069c9f0269ebba64ab30d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Aug 3 07:37:10 2020 +0000
Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only on pages in need
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d79a19d3a0c32bd40279f138c3ca367042c290f9
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Aug 3 07:29:15 2020 +0000
Bug 24201: (QA follow-up) Fix desks select box selected attribute
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 45e1f325d590aaf8c46513d5eef0bd17e31d804c
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Aug 3 07:14:51 2020 +0000
Bug 24201: (QA follow-up) Remove unneeded use
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ad9fdd792a4433d2ea5ea58a081f036d4230fdb8
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Aug 3 07:11:49 2020 +0000
Bug 24201: (QA follow-up) Do not unbless a list from search in Desks template plugin
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1f96bea8bab9d2c259ef354bca5c554c351c5403
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 20 13:38:34 2020 +0100
Bug 24201: (QA follow-up) Re-indent helpers
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 50e1f1abc1e1e9bb7294194aeba480f0441bd4b2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 20 13:37:59 2020 +0100
Bug 24201: (QA follow-up) Hide header if desks disabled
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a02e9e3d9107e4ae4b2a03128d53c786766d2582
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jul 20 13:20:39 2020 +0100
Bug 24201: (QA follow-up) Remove deprecated template file
The controller associated to this template was deprecated earlier in
this patchset, but the template was left behind.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4163f24014addb4cc5fddbb854f84617ffffb988
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Tue Apr 28 12:02:15 2020 +0200
Bug 24201: (follow-up) add desk choice with library choice
You should be able to add desk choice when you are logging in or
changing library.
Test plan:
1. apply patch
2. have at least three libraries, one without desk, one with one and
one with a few.
3. At login, when choosing a library, it should enable all desks it
has. Pick one.
4. the desk id and name should be set in your session and appear in
the top right, next to the library name.
5. change library and desks from intranet (at the set-library.pl page)
6. you should have the same behaviours
7. if you have a library without a desk, it should prompt you a '---'
option and no desks will be attached to the session.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2d7fd8c09265880bf7ec548877569d698d14cdbb
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Mar 26 14:49:27 2020 +0000
Bug 24201: (follow-up) Rework Desks Plugin
This patch removes unused plugin methods (they can be re-introduced in
subsequent bugs where they are used) and merges the 'all' and 'defined'
methods into a ListForBranch method that returns a list of desks
associated with the logged in branch.
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 876d95285ef06224b0d50249b7096b55abff400d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Mar 26 13:49:57 2020 +0000
Bug 24201: (follow-up) Use GetLoggedInDeskName
This patch updates the templates to use the new TT plugin instead of
adding additional variables to the already crouded get_template_and_user.
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1cee6b7025e42c4e69d7dca0f4c852c66c939e36
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 25 12:13:10 2020 +0000
Bug 24201: (follow-up) Show desk information at lower screen widths
The staff client header menu adjusts responsively to narrower viewport
widths, but for the logged-in-user menu this requires showing and hiding
part of the template which duplicates information. This patch adds a
copy of the current desk information to the part of the template shown
at narrower widths.
To test, apply the patch and view any page in the staff client.
- Narrow your browser so that the viewport is less than 800px wide.
- The logged-in-user menu should change from text to a single "user"
icon.
- Clicking the icon should display a menu which includes labeled
information about the current desk.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3fc961b7c263a74da4759c70a3acff00eee71ec1
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Tue Dec 10 15:02:31 2019 +0100
Bug 24201: Attach desk to intranet session
When Desks are defined, a librarian can attach a desk to its session.
Test plan:
1. apply 13881 and create some desks
2. you should see “NO DESK SET” in the intranet header
3. go to circulation > Set desk
4. you should see your desk name in the header, whatever the page
5. you can also set desk with the header menu
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit df0ef02de5e4efe23aafab77e25d0e19f658151c
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Apr 10 11:19:47 2020 +0200
Bug 24591: Add --help option to misc/devel/get-prepared-letter.pl
Also fix code style with perltidy
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f74ab4e9de75b53dc7040814b1f25ae282a81106
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Feb 5 12:20:37 2020 +0100
Bug 24591: Add developer script to preview a letter
The script is very simple, it just calls GetPreparedLetter with
arguments given on command line and print the resulting letter content
Usage example:
misc/devel/get-prepared-letter.pl --module circulation \
--letter_code ODUE --tables '{"borrowers":1,"branches":"CPL"}' \
--repeat '{"item":[{"biblio":1,"items":1}]}' \
--loops '{"overdues":[1]}'
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works for the example and other cases.
Correct option is 'letter-code', with dash, not underscore.
An usage message would be nice.
No errors
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
JD amended patch: tidy the new file and rename it matching the other
scripts' names in this directory
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3abc4fb8584e0df2b71dd9d38f033e34b205e829
Author: David Roberts <david at koha-ptfs.co.uk>
Date: Sun May 3 23:48:09 2020 +0000
Bug 25336: Show checkouts/fines to guarantor is in the wrong section of the patron file
This patch moves the "Show checkouts to guarantor" and "Show fines to
guarantor" data to display under the Contact information block
To test:
1) Enable the AllowStaffToSetCheckoutsVisibilityForGuarantor and AllowStaffToSetFinesVisibilityForGuarantor system preferences to Allow
2) View a patron record.
3) The "Show checkouts to guarantor" and "Show fines to guarantor" field
will be on the right hand side of the screen under the Library use
block.
4) Apply patch
5) Check that this data has now moved to the Contact information block
on the left hand side of the patron record.
Works for me!
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0a40f71075c7dff1d9a99ab66b4210849c506648
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 6 18:19:58 2020 +0000
Bug 25606: (QA follow-up) Don't show remove all button if no reserves
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5cf05ff53d7284500a2653f7b0988d6a46a7ea13
Author: Joseph Sikowitz <joe at flo.org>
Date: Sat May 23 17:45:51 2020 -0400
Bug 25606: Remove all reserve items button
Adds button to course records to remove all attached reserve items. A warning dialog box will appear before executed.
Test plan
1. Install patch
2. Log in as user with permission to delete reserves
3. View a course reserve record with multiple items attached
4. There should now be a button that says "- Batch remove reserves"
5. When you click the button a dialog box should appear with a warning
6. Click "Ok"
7. All course reserves should be removed from the record
8. Add an item to more than course record
9. Redo 3-7
10. Items should have been removed from that course but remain on all other courses
11. Log in as a user without delete reserves permission
12. You should not see the batch remove option
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 27ff36825dd6ac8f87dc7d380c60f21e8170dea6
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jul 18 10:24:23 2020 +0000
Bug 25919: Only show Desks in admin navigation when UseCirculationDesks is used
We were missing a check for the UseCirculationDesks in the
template so the "Desks" link would only appear in the admin navigation
when the pref feature is activated.
To test:
- Turn off UseCirculationDesks
- Go to any administration page that shows the navigation on the left
- Verify Desks shows
- Apply patch
- Reload the admin page - Desks should be gone
- Turn on UseCirculationDesks
- Verify the Desks reappear
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e7661a37e657141b994d74398dd8e1b96d1da117
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jul 18 01:53:34 2020 +0000
Bug 25853: Fix file permissions for update_patrons_category script
The permissions for this were -rw-r--r-- and need to be -rwxr-xr-x.
To test:
- Verify the file permissions before and after applying the patch.
Signed-off-by: Didier Gautheron <didier.gautheron at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d08ce1d9406feca7bc7e5ab0be58efea94c7a2e5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Aug 6 19:15:44 2020 +0000
Bug 26009: (QA follow-up) It does not harm to test more
Test plan:
prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
--> should return green
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4dd1672c1b2f15e0b6be6071b6915c927c3a2ecc
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 17 16:23:42 2020 +0000
Bug 26009: Add facet size to home/holdingbranch
To test:
0 - Set DisplayLibraryFacets to 'both' and FacetMaxCount to 20
1 - Have more than 10 branches
2 - Have items in each of those branches
3 - Enable ES, set system preference SearchEngine to Elasticsearch
4 - Search for '*'
5 - Expand homebranch/holdingbranch facets
6 - Note you only get 10
7 - Apply patch
8 - Repeat search
9 - Now you get all your facets
Signed-off-by: Michael Springer <mspringer at mylakelibrary.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 44f54aac602ae99d83d954a2f102d77ff93ecfa7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Aug 4 13:13:43 2020 +0000
Bug 26136: Prevent double submit on checkin-form
To test:
1 - Browse to Circulation->Check-in
2 - Type a barcode into the Check in box
3 - Hit Enter as many as times as you can
4 - Check the statistics table:
SELECT * FROM statistics WHERE itemnumber={itemnumber} AND DATE(datetime)=CURDATE();
5 - Note you have multiple lines for the same item at the same time
6 - Apply patch
7 - Reload the page
8 - Type the barcode
9 - Press Enter even more fast and more furiously
10 - Check the statistics table
11 - Only one entry, huzzah!
Signed-off-by: Sally <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 85005b719876071047e4f6b99321549b665bcc05
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 6 13:29:44 2020 +0200
Bug 26158: Fix Z3950 search button broken for translations
This is similar to bug 23713
var SEARCH_RESULTS = [% IF (SEARCH_RESULTS) %]1[% ELSE %]0[% END %];
become, once translated:
var SEARCH_RESULTS = [% IF (SEARCH_RESULTS) %]1[% ELSE %][% END %];
and a JS error appears in the console
Uncaught SyntaxError: expected expression, got ';' search.pl:636:29
Caused by
commit ef4306cc02e2f15aa2466ae65d0b4f9a1fd70ad9
Bug 23885: Move staff client search results JavaScript into separate file
Test plan:
Use the staff interface in a translated language
Search for a term that won't return any results
Click the Z3950 button
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a96433446e87c03ac6e253a54eb067ac93a33575
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 6 15:08:48 2020 +0200
Bug 26162: Make Selenium click action more robust
See
https://stackoverflow.com/questions/12967541/how-to-avoid-staleelementreferenceexception-in-selenium
https://www.selenium.dev/exceptions/
https://developer.mozilla.org/en-US/docs/Web/WebDriver/Errors/StaleElementReference
This patch will fix the following failure we get under D11:
18:47:07 selenium_1 | 09:47:07.478 WARN - Exception: Element not found in the cache - perhaps the page has changed since it was looked up
18:47:07 selenium_1 | For documentation on this error, please visit: http://seleniumhq.org/exceptions/stale_element_reference.html
18:47:07 selenium_1 | Build info: version: '2.53.1', revision: 'a36b8b1', time: '2016-06-30 17:37:03'
18:47:07 selenium_1 | System info: host: '78b9a07f51f2', ip: '192.168.16.2', os.name: 'Linux', os.arch: 'amd64', os.version: '4.19.0-9-amd64', java.version: '1.8.0_91'
18:47:07 selenium_1 | Driver info: driver.version: unknown
18:47:07 koha_1 |
18:47:07 koha_1 | STRACE: /usr/share/perl5/Try/Tiny.pm:123 in Selenium::Remote::Driver::catch {...}
18:47:07 koha_1 | /usr/local/share/perl/5.26.1/Selenium/Remote/Driver.pm:353 in Try::Tiny::try
18:47:07 koha_1 | (eval 1571):1 in Selenium::Remote::Driver::__ANON__
18:47:07 koha_1 | (eval 1573):2 in Selenium::Remote::Driver::__ANON__
18:47:07 koha_1 | (eval 1546):17 in Selenium::Remote::Driver::_execute_command
18:47:07 koha_1 | /usr/local/share/perl/5.26.1/Selenium/Remote/WebElement.pm:63 in Selenium::Remote::WebElement::_execute_command
18:47:07 koha_1 | /kohadevbox/koha/t/lib/Selenium.pm:184 in Selenium::Remote::WebElement::click
18:47:07 koha_1 | /kohadevbox/koha/t/lib/Selenium.pm:172 in t::lib::Selenium::click_when_visible
18:47:07 koha_1 | t/db_dependent/selenium/administration_tasks.t:131 in t::lib::Selenium::click
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fd94f11afb5af5fc051ac75f3804cb9ea38fc677
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 6 12:40:20 2020 +0000
Bug 25826: (QA follow-up) Add filters
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b0c47ad824e5bbfeb119558b7221df50b36a8ae4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 27 12:18:36 2020 -0300
Bug 25826: Forbid changing the hidden attributes for biblionumber
This patch tweaks the UI so it forbids changing the hidden values when
they are correct (i.e. when they are not hidden in OPAC and intranet).
To test:
1. Apply the first patch
2. Play with the hidden values of the subfield you have mapped to
biblio.biblionumber in your picked framework. This is usually 999$c
in MARC21, and 001 in UNIMARC.
=> SUCCESS: When you verify the about.pl, it mentions issues when you
hide in some of the interfaces
3. Apply this patch and reload everything
4. Repeat 2
=> SUCCESS: If your framework is 'ok', it prevents you from editing this
values, otherwise you can change them.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2a1406c4766e43460dd3bf8c99c0636b51e9c7c4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 22 16:43:38 2020 +0200
Bug 25826: Add a warning to the about page
This patch adds a warning to the about page if the biblionumber field is
hidden at the OPAC or staff interface.
Test plan:
Hide the biblionumber to some framework
Confirm that there is a warning on the about page
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 27 +++--
C4/Context.pm | 7 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 4 +-
Koha/Template/Plugin/Desks.pm | 104 +++++++++++++++++++
about.pl | 28 +++++
admin/marc_subfields_structure.pl | 28 +++++
circ/set-library.pl | 22 ++++
course_reserves/course-details.pl | 10 +-
koha-tmpl/intranet-tmpl/prog/css/login.css | 2 +-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 4 +-
.../intranet-tmpl/prog/en/includes/circ-nav.inc | 11 +-
.../intranet-tmpl/prog/en/includes/header.inc | 37 ++++++-
.../prog/en/includes/html_helpers.inc | 15 +++
.../prog/en/includes/intranet-bottom.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 16 ++-
.../en/modules/admin/marc_subfields_structure.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 16 +++
.../prog/en/modules/catalogue/results.tt | 6 +-
.../prog/en/modules/circ/circulation-home.tt | 4 +
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 +
.../prog/en/modules/circ/set-library.tt | 37 ++++++-
.../en/modules/course_reserves/course-details.tt | 7 ++
.../prog/en/modules/members/moremember.tt | 36 +++----
koha-tmpl/intranet-tmpl/prog/js/desk_selection.js | 42 ++++++++
.../prog/js/marc_subfields_structure.js | 18 +++-
misc/cronjobs/update_patrons_category.pl | 0
misc/devel/get_prepared_letter.pl | 114 +++++++++++++++++++++
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 5 +-
t/lib/Selenium.pm | 15 ++-
29 files changed, 564 insertions(+), 55 deletions(-)
create mode 100644 Koha/Template/Plugin/Desks.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/desk_selection.js
mode change 100644 => 100755 misc/cronjobs/update_patrons_category.pl
create mode 100755 misc/devel/get_prepared_letter.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list