[koha-commits] main Koha release repository branch master updated. v20.05.00-1344-gd2c59eda85
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 12 12:07:19 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 d2c59eda8553432df3fae8b001d287eb9210f594 (commit)
via 5ee3b6bbb2f8611b869494e0723918f6bf0bead8 (commit)
via 3611a2cd6819fee960aacffd5f5f3dcc09d8a7ee (commit)
via 26eadaa7de02e7371323f06c03bfbc1c0f2aac1b (commit)
via f4f03c04e8a1e6afc2160bc24116b6f2a8ed72a1 (commit)
via 7478b9430661de4310862f1d29fb2f593d08879d (commit)
via 8cc1f02a9481682a8230f2cf57cad6193effa460 (commit)
via 176a678fbe7ee1a8484c0123358e97a5d73487c5 (commit)
via a4ca6c144142115dc3e184ae078d306c104d446d (commit)
via a06223a20d8ce9c0dff6c706a73d13f3169d9ab4 (commit)
via 7bc87ce75ec857292e433c0f6123b2ea02ef6d60 (commit)
via b6f5768145bf21085ecd5024d6e021e4d3c64e15 (commit)
via 2aa6afd50ac9d806f11d78266a7527c7fd5b17a2 (commit)
via 549d033cb119687c8eb75e6d2a2bfa178dbd9be6 (commit)
via c3f2993bdbbd8453c3b604c5d2cf43dc9ee27c88 (commit)
via ff17013a65036200fb0cb208107dc9f70778c49c (commit)
via 62a569ea732cf656073e6cbb38ab7ac96df32945 (commit)
via 30fcb92d62e574dbc1ff16c048cb1b12f653f7cf (commit)
via bd2087e1cdbeeb8a207fc6881fc2472e8fdb323c (commit)
via 352e8d23068caa248415a3081b50978d88e94762 (commit)
via d50332c1e57bfe623ce2f7c6ce427dbd12990062 (commit)
via 707612508311d104a0850aafbd7c678ec05ab389 (commit)
via ab480d811740fb3b2b160fd752b57508f1c108d5 (commit)
via 3599e0001db2b405655c348d2b8c94bd15769fd2 (commit)
via 9f4b54a6d74b9635195bb9ea0b9c11fe5570cf6e (commit)
from 9ddb312749c34fc4d1c19d48570725978c813bbd (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 d2c59eda8553432df3fae8b001d287eb9210f594
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 12 11:28:16 2020 +0200
Bug 26145: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5ee3b6bbb2f8611b869494e0723918f6bf0bead8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 12 11:26:51 2020 +0200
Bug 26145: DBIC schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3611a2cd6819fee960aacffd5f5f3dcc09d8a7ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 12 09:13:18 2020 +0000
Bug 26145: DBRev 20.06.00.049
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 26eadaa7de02e7371323f06c03bfbc1c0f2aac1b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Sep 25 19:05:02 2020 +0000
Bug 26145: (QA follow-up) Add missing filters
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f4f03c04e8a1e6afc2160bc24116b6f2a8ed72a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 28 17:00:17 2020 +0200
Bug 26145: Add the new column to the column settings yml file
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7478b9430661de4310862f1d29fb2f593d08879d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 21 18:14:50 2020 +0200
Bug 26145: Correctly preserve itemnumber value
In order to know we are dealing with the cover images of a specific item
we need to pass it though the different forms.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8cc1f02a9481682a8230f2cf57cad6193effa460
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 18 16:16:50 2020 +0200
Bug 26145: Add the "Cover image" column to the table settings
The new column can now be hidden by the table settings
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 176a678fbe7ee1a8484c0123358e97a5d73487c5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 18 15:56:02 2020 +0200
Bug 26145: Hide 'Upload image' if no CoverImage pref is set
If LocalCoverImages AND OPACLocalCoverImages are disabled, we should not
let the ability to upload an image for the items.
We should also hide the column "cover image" in the tables
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a4ca6c144142115dc3e184ae078d306c104d446d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 18 15:55:20 2020 +0200
Bug 26145: Fix image tag
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a06223a20d8ce9c0dff6c706a73d13f3169d9ab4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 11 18:26:01 2020 +0200
Bug 26145: Allow multi covers per item
In this patch we remove the limitation of 1 cover image per item
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7bc87ce75ec857292e433c0f6123b2ea02ef6d60
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 5 16:27:14 2020 +0200
Bug 26145: Refactoring - Move C4::Images to Koha::CoverImages
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b6f5768145bf21085ecd5024d6e021e4d3c64e15
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 5 16:27:06 2020 +0200
Bug 26145: Refactoring - Rename table biblioimages to cover_images
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2aa6afd50ac9d806f11d78266a7527c7fd5b17a2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 29 18:29:03 2020 +0200
Bug 26145: Refactoring - Add tests
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 549d033cb119687c8eb75e6d2a2bfa178dbd9be6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 29 18:18:15 2020 +0200
Bug 26145: Display the cover image at the OPAC
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c3f2993bdbbd8453c3b604c5d2cf43dc9ee27c88
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 28 21:18:20 2020 +0200
Bug 26145: Add the ability to upload a cover image per item
This patchset adds the ability to attach cover images at item level.
This commit message will explain the different patches that are
following.
The main idea is to have cover images for a given item. This is useful
for a bibliographic record linked with a subscription. Each item could
have the cover image for the serial numbers.
In this first patch there is a limitation to allow only 1 cover per
item, but a later patch will remove it. That way we will take advantage
of the recent work done to display nicely cover images (bug 25031), and
reuse it in this development (staff interface only).
In order to use a flexible and robust code, the legacy C4 code
(C4::Images) has been moved to Koha::CoverImages. Also the DB table
biblioimages has been renamed cover_images.
Test plan (for the whole patch set):
0. Turn off AllowMultipleCovers
1. Create a new bibliographic record and items
2. Attach a cover image to the bibliographic record
3. In the item list of the bibliographic detail page, you will notice a
new "Upload image" action. Select it
4. Select an image
=> Notice the new column in the item table
5. Upload another image
=> You cannot upload 2 images, you are going to replace the existing one
6. Turn on AllowMultipleCovers
7. Attach another image to the image
=> Notice the 2 images are displayed nicely, with navigation controls
8. Confirm you can view an image if you click on it and you can delete it
9. Test the OPAC view now
=> Cover image for items are displayed in the table, there is no
navigation controls here however.
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff17013a65036200fb0cb208107dc9f70778c49c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 28 21:13:01 2020 +0200
Bug 26145: DB changes - Add biblioimages.imagenumber
Sponsored-by: Gerhard Sondermann Dialog e.K. (presseplus.de, presseshop.at, presseshop.ch)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 62a569ea732cf656073e6cbb38ab7ac96df32945
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 5 17:50:39 2020 +0000
Bug 26152: Remove the use of jquery.checkboxes plugin from serial collection page
This patch removes the use of the jquery.checkboxes plugin from the
serial collection page and replaces it with custom JS.
To test, apply the patch and go to Serials.
- Locate a subscription which has multiple issues.
- View the details for that subscription.
- In the sidebar menu click the "Serial collection" link.
- On the serial collection page test the "Select all" and "Clear all"
links at the top of each table of issues. The controls should work
correctly and only affect the table on that tab.
Signed-off-by: David Nind <david at davidnind.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 30fcb92d62e574dbc1ff16c048cb1b12f653f7cf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 5 18:53:46 2020 +0000
Bug 26154: Remove the use of jquery.checkboxes plugin from batch item deletion and modification
This patch removes the use of the jquery.checkboxes plugin from the
batch item modification and batch item deletion pages.
To test, apply the patch and go to Tools -> Batch item
modification.
- Submit a batch of barcodes.
- On the results page, test the "Select all" and "Clear all" controls
at the top of the page. These should work correctly on the checkboxes
in the table of results.
- Test that the "Clear on loan" control still works to uncheck
checkboxes corresponding to items which are checked out.
- Test the "Show all columns" and "Hide all columns" checkboxes in the
"Show/hide columns" section. These should work correctly on the
checkboxes for showing and hiding columns in the table.
- Go to Tools -> Batch item deletion.
- Submit a batch of barcodes.
- Repeat the same testing steps above (except the "Clear on loan"
step).
Signed-off-by: David Nind <david at davidnind.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 bd2087e1cdbeeb8a207fc6881fc2472e8fdb323c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Sep 21 05:52:27 2020 +0000
Bug 26503: Add unit tests
Run
prove t/db_dependent/Acquisition.t
Verify all tests pass.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
JD Amended patch: perltidy
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 352e8d23068caa248415a3081b50978d88e94762
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Sep 22 00:32:51 2020 +0200
Bug 26503: Add limit for standing orders to acq advanced search
This allows to filter on standing orders on the acq advanced search
checkbox. For this purpose a new checkbox is shown behind the order
status search option.
As both not yet ordered and standing orders have the status
'new' or partially received internally, this seems like a good
placement as it will help distinguish these cases clearly.
new + standing order = standing order, but nothing received yet
partially received + standing order = active standing order
all status + standing order = all standing orders
To test:
- Create some baskets with at least one order, some 'standing' and
others not
- In the top toolbar choose tab Orders search > Advanced search
- Make some searches with and without the new 'Standing order' option
- Verify the right orders are found
- In the search results standing orders will now show with the
status + (standing order).
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d50332c1e57bfe623ce2f7c6ce427dbd12990062
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 12 11:27:58 2020 +0200
Bug 26519: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 707612508311d104a0850aafbd7c678ec05ab389
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Sep 23 16:14:55 2020 +0000
Bug 26519: Clean up OPAC buttons with incorrect classes
This patch makes some corrections to the OPAC templates to add the
correct classes to a few buttons which were missed during the
Bootstrap 4 upgrade, especially in cases where the buttons only appear
when JavaScript is disabled.
To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
- Locate the bibliographic record for a serial record and view the
details. The subscription should have patron notification set.
- Under the Subscriptions tab, the "Subscribe to email notifications"
button should look correct.
- Click to subscribe and confirm that the buttons during and after the
process look correct.
- Perform a catalog search in the OPAC. On the search results page,
disable JavaScript. This can be done in the browser's developer tools
under "Settings."
- At the top of the table of search results there should be a
correctly-styled "Go" button next to the sorting dropdown menu. It
should work correctly.
- View the contents of a list with JavaScript disabled.
- The "Resort list" button should be correctly-styled and should work to
submit the form.
Signed-off-by: David Nind <david at davidnind.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 ab480d811740fb3b2b160fd752b57508f1c108d5
Author: Mason James <mtj at kohaaloha.com>
Date: Sat Oct 10 14:06:28 2020 +1300
Bug 22343: Make the tests pass on U16
fix SSL tests for u16, using older Email-Sender-1.300021
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3599e0001db2b405655c348d2b8c94bd15769fd2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 12 09:32:16 2020 +0200
Bug 26529: Remove warning
Use of uninitialized value $rule_value in string eq
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9f4b54a6d74b9635195bb9ea0b9c11fe5570cf6e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 2 12:11:48 2020 -0400
Bug 26604: "Generate next" button gives error on serials-collection.pl
In serials-collection.pl, the line
$frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
causes the error
Can't use string ("13") as a HASH ref while "strict refs" in use at /usr/share/koha/lib/C4/Serials.pm line 2198.
This function call makes no sense, that subroutine always returns a list and doesn't take any parameters. I think it was meant to be GetSubscriptionFrequency which is in fact already called a few lines down.
Signed-off-by: kelly mcelligott <kelly at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
JD
Test plan:
1. Create a new subscription
* When there is an irregular issue: Skip issue number
* Select a frequency (not irregular)
* Test prediction pattern and mark some "not published" (to fill the subscription.irregular DB field
2. Receive a first serial (mark it arrived, an "expected" one is created)
3. Claim the expected one
=> You have 1 arrived and 1 claimed.
It's the only way to not have an expected one and hit the else block in serials/serials-collection.pl
4. Generate next => boom
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 9 +
C4/Images.pm | 206 ---------------------
Koha.pm | 2 +-
Koha/Biblio.pm | 15 ++
Koha/CirculationRules.pm | 2 +-
Koha/CoverImage.pm | 116 ++++++++++++
Koha/{Acquisition/Currencies.pm => CoverImages.pm} | 30 ++-
Koha/Item.pm | 15 ++
Koha/Schema/Result/Biblio.pm | 32 ++--
Koha/Schema/Result/Item.pm | 19 +-
acqui/histsearch.pl | 1 +
admin/columns_settings.yml | 6 +
catalogue/detail.pl | 19 +-
catalogue/image.pl | 55 +++---
catalogue/imageviewer.pl | 28 ++-
installer/data/mysql/kohastructure.sql | 12 +-
installer/data/mysql/updatedatabase.pl | 27 +++
.../intranet-tmpl/prog/css/src/staff-global.scss | 9 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/includes/filter-orders.inc | 6 +
.../prog/en/modules/acqui/histsearch.tt | 1 +
.../admin/preferences/enhanced_content.pref | 2 +-
.../prog/en/modules/catalogue/detail.tt | 200 ++++++++++++--------
.../prog/en/modules/catalogue/imageviewer.tt | 53 ++++--
.../prog/en/modules/serials/serials-collection.tt | 5 +-
.../prog/en/modules/tools/batchMod-del.tt | 1 -
.../prog/en/modules/tools/batchMod-edit.tt | 1 -
.../prog/en/modules/tools/upload-images.tt | 34 ++--
koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js | 24 ++-
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/src/opac.scss | 13 ++
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 28 ++-
.../bootstrap/en/modules/opac-imageviewer.tt | 22 +--
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 7 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/js/localcovers.js | 37 +++-
opac/opac-detail.pl | 17 +-
opac/opac-image.pl | 54 +++---
opac/opac-imageviewer.pl | 21 ++-
serials/serials-collection.pl | 3 +-
svc/cover_images | 17 +-
t/Images.t | 71 -------
t/db_dependent/Acquisition.t | 43 ++++-
t/db_dependent/Koha/CoverImages.t | 94 ++++++++++
t/db_dependent/Koha/SMTP/Server.t | 4 +-
tools/upload-cover-image.pl | 69 +++++--
47 files changed, 866 insertions(+), 572 deletions(-)
delete mode 100644 C4/Images.pm
create mode 100644 Koha/CoverImage.pm
copy Koha/{Acquisition/Currencies.pm => CoverImages.pm} (58%)
delete mode 100755 t/Images.t
create mode 100644 t/db_dependent/Koha/CoverImages.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list