[koha-commits] main Koha release repository branch master updated. v20.05.00-1661-g31e9ac9a2c
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 4 18:05:54 CET 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 31e9ac9a2c6e54e458a7f5bc49b83a2d05a83d2c (commit)
via fe7abf020c6c13978ce84393b4877688b6f3ebce (commit)
via e700fb8f4ec323102d4cd6967bc4fb589ddc4032 (commit)
via fbeb3d547f1bacccfa585ec02e72494decc0e1a0 (commit)
via 6884665d55a304cb07c2e385a22e4a2868a66486 (commit)
via 43e6557a2ae1082f684fd073b476511730d05f66 (commit)
via 62bf6ed986c26bf2802757a829546642206b9987 (commit)
via 8066a1a6eb6260724d42d4416ee762a13bcc1629 (commit)
via 7c9e44b24ec7f6cbe203ae5832924316a7601193 (commit)
via 2b1da2aa0ced03f8afe56c4624ec77d49e5000a2 (commit)
via 8ce23ea0e9a8820ff3a298e7f553e1bbf54d4bed (commit)
via ece8a0c35c5843f0a0cd4ef94ff405e306aedef1 (commit)
via 48880284867a96d8767e7d15f6bfe1a035b2ee6e (commit)
via ea7e83b2712c48a0c9a157b2fb36eb782b26f34b (commit)
via 6ce56f1134d99280af30e128f57189b285966180 (commit)
via 0b565d1c7a46291bae89c5cc33fca246202c6988 (commit)
from 6ba108f4eb18eb27a1b8be55b33b4e28df4b806f (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 31e9ac9a2c6e54e458a7f5bc49b83a2d05a83d2c
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Wed Nov 4 17:05:28 2020 +0200
Bug 26132: (follow-up) Fix broken code in TooMany function
The $checkouts variable was not defined in the PatronLibrary case at
all and in the else case the SQL join was totally missing.
To test:
1) Without this patch notice prove
t/db_dependent/Circulation/TooMany.t fails
2) With this patch notice prove
t/db_dependent/Circulation/TooMany.t succeeds
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fe7abf020c6c13978ce84393b4877688b6f3ebce
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Wed Nov 4 17:00:02 2020 +0200
Bug 26132: (follow-up) Add test to show errors in max issues amount calculation
If you set default branch limits for issue quantity circulation
rules you will get errors when calling TooMany function.
To reproduce the error:
1) Apply this patch
2) Run prove t/db_dependent/Circulation/TooMany.t and notice the
following error:
No method count found for Koha::Checkouts DBIx::Class::Storage::DBI::_dbh_execute(): DBI Exception: DBD::mysql::st execute failed: Unknown column 'item.homebranch' in 'where clause' [...]
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e700fb8f4ec323102d4cd6967bc4fb589ddc4032
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 16 11:47:24 2020 +0000
Bug 23823: (QA follow-up) Fix filter in link
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fbeb3d547f1bacccfa585ec02e72494decc0e1a0
Author: Ivan Masár <helix84 at centrum.sk>
Date: Thu Oct 17 13:49:16 2019 +0200
Bug 23823: (follow-up) minor visual fix
Do not allow a line break between the bookmark icon and syspref name.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6884665d55a304cb07c2e385a22e4a2868a66486
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 11 02:18:41 2019 +0000
Bug 23823: (follow-up) Get rid of some tabs in favor of spaces
In the paragraph touched by this patch, there were some
whitespace issues. This patch does some tab to space
replacement and reindentation to make the code more readable.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Ivan Masár <helix84 at centrum.sk>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 43e6557a2ae1082f684fd073b476511730d05f66
Author: Ivan Masár <helix84 at centrum.sk>
Date: Wed Oct 16 13:17:37 2019 +0200
Bug 23823: Allow system preferences to be bookmarked
Test plan:
1) Log in to Staff UI with superlibrarian permissions
2) Go to System Preferences /cgi-bin/koha/admin/preferences.pl
3) Next to each preference, there should now be a bookmark icon
4) The bookmark icon links to a search for the exact preference name
5) The link can be bookmarked for quick reference to the specific
preference
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 62bf6ed986c26bf2802757a829546642206b9987
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 19 14:36:34 2020 +0000
Bug 26729: Add focus class to vendor name field in vendor add form
This patch adds the "focus" class to the vendor name field in the form
for adding or editing a vendor in acquisitions.
To test, apply the patch and go to Acquisitions -> New vendor.
On page load the cursor focus should automatically be on the vendor name
field. The same should true when editing an existing vendor.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Barbara Johnson <barbara.johnson at bedfordtx.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8066a1a6eb6260724d42d4416ee762a13bcc1629
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Nov 4 11:08:30 2020 +0000
Bug 26745: (QA follow-up) Add Unit Tests
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7c9e44b24ec7f6cbe203ae5832924316a7601193
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Oct 20 09:43:22 2020 +0100
Bug 26745: Add TT support to 'title' in notices
This patch adds support for using TT syntax in the title element of the
notices system.
Test plan
1/ Edit an easily triggerable email notice such that the title contains
some template toolkit markup.
Example: Edit the 'CHECKOUT' notice to include [% today %] in the
title field.
2/ Trigger the notice (For 'CHECKOUT' that means checking an item out to
a user (Preferably with 'email' selected in their advanced messaging
preferences for the notice)
3/ Either, navigate to the 'Notices' tab for the user, or run the
message queue and inspect the subject line of the recieved email.
4/ Prior to the patch the TT syntax would remain 'as is'.. i.e
'[% today %]'.
5/ After the patch, the TT syntax should have been properly replaced.
6/ Signoff
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2b1da2aa0ced03f8afe56c4624ec77d49e5000a2
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Mon Nov 2 23:39:21 2020 +0000
Bug 26804: (QA follow-up) add modal-lg class and intent markup correctly
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8ce23ea0e9a8820ff3a298e7f553e1bbf54d4bed
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Wed Oct 28 04:22:54 2020 +0000
Bug 26804: Add modal content preview
This patch turns the 'News' column into a preview button. That preview button displays a modal with content of that rows news item.
To test:
1. Apply patch
2. Add some HTML to a News Item. I am using a bunch of lorem ipsum HTML and this image set to 1000px. '<img src="https://koha-community.org/files/2013/09/cropped-kohabanner3.jpg" width="1000" />'.
3. Make sure and have some content with a lot of width and some content with a lot of height.
4. Test the Preview content button
5. Make sure you can scroll through long modals and across modals that are wide
6. Try at different screen sizes and with different combonations of News items
Signed-off-by: Kelly <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ece8a0c35c5843f0a0cd4ef94ff405e306aedef1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 4 17:32:20 2020 +0100
Bug 26886: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 48880284867a96d8767e7d15f6bfe1a035b2ee6e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 2 13:43:27 2020 +0000
Bug 26886: Correct style of alert-error class in the OPAC
This patch makes a minor change to the OPAC SCSS so that instances of
"alert-error" classes are styled the same as messages with the Bootstrap
4 "alert-warning" class. This change is simpler than making multiple
changes to scripts and templates.
To test, apply the patch and try to view a single news item in the OPAC
which doesn't exist:
/cgi-bin/koha/opac-main.pl?news_id=XXX
- You should see a warning message with a pale yellow background, "This
news item does not exist."
- Submit a suggestion, and then submit another suggestion with the
same title.
- You should see a warning message, "The suggestion has not been
added. A suggestion with this title already exists."
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ea7e83b2712c48a0c9a157b2fb36eb782b26f34b
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date: Tue Nov 3 12:27:14 2020 +0200
Bug 24567: (QA follow-up) Remove warning in regex
Without this patch we get
Use of uninitialized value $3 in concatenation (.) or string at /kohadevbox/koha/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 943.
This converts the | OR operator to two different regexes so that the
capture group variables will be defined in every case.
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6ce56f1134d99280af30e128f57189b285966180
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 27 11:26:53 2020 +0000
Bug 24567: Don't strip spaces along with dangling colons
This updates the regex used for removing colons to capture those with space on either side, and remove the colon
while preserving the space
To test:
1 - Have Koha using ES
2 - Search for:
ti:chess AND chess
3 - You should get a result in sample data, otherwise replace 'chess' with a title in your catalogue
4 - Search for:
ti:chess AND kw:chess
5 - No result
6 - Enable DumpTemplateVarsIntranet and DumpSearchQueryTemplate
7 - Repeate search and check page source
8 - search_query has:
title:chess ANDchess
9 - Apply patch
10 - Repeat
11 - Seaerch works!
12 - query is now:
title:chess AND chess
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Bug 24567: (follow-up) Use dollar sign to refer to captures
Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0b565d1c7a46291bae89c5cc33fca246202c6988
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 19 13:36:04 2020 +0000
Bug 26736: Compare values of reports log entries
This patch adds the ability to compare the log entries for reports
in the system log. The user can select two entries in the log search
results and view a diff of the two versions.
To test, apply the patch and check that the ReportsLog system
preference is enabled. If it isn't, enable it and make some changes to
saved SQL reports so that you have log entries to test with.
This is a trivial patch that simply adds "REPORTS" type log entries to
the list of modules which can be selected for comparison. The full test
plan is basically the same as that for Bug 26207:
- Perform a search for log entries in the "Reports" module.
- In the results, each entry for a report update should have a
"Compare" checkbox."
- Check one of the checkboxes.
- The table should now be filtered by the report title. This
facilitates meaningful selections for comparison.
- You should see a message displayed onscreen, "Showing results
for...[report name]"
- The "Check none" link in the toolbar above the table should now be
enabled.
- If youy click the "Compare selected" link in the toolbar at this
stage you should get a message, "You must select two entries to
compare."
- If you uncheck the checkbox the table should return to an unfiltered
state.
- Check two checkboxes.
- The "Compare selected" link in the toolbar should now be enabled.
- Next to each of the checkboxes you checked should be a "View
comparison" link.
- Clicking either of the "View comparison" links or the "Compare
selected" link should trigger a modal with the diff view of the two
reports log entries.
- Try to select a third checkbox. You should get a message, "You can
select a maximum of two checkboxes." The box should remain unchecked.
- Test that unchecking both checkboxes manually clears the table filter.
- Test that the "Check none" link works to uncheck checked boxes and
clear the table filter.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 5 ++-
C4/Letters.pm | 9 ++++
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 3 +-
.../prog/en/modules/acqui/supplier.tt | 2 +-
.../prog/en/modules/admin/preferences.tt | 16 ++++---
.../prog/en/modules/tools/koha-news.tt | 24 ++++++++++-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac-rtl.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/sco-rtl.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/sco.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss | 5 +++
t/Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 9 ++--
t/db_dependent/Circulation/TooMany.t | 12 ++++++
t/db_dependent/Letters/TemplateToolkit.t | 50 +++++++++++++---------
15 files changed, 103 insertions(+), 42 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list