[koha-commits] main Koha release repository branch master updated. v20.05.00-1842-gf11484ae7f
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 11 16:41:38 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 f11484ae7f43092352f7b9376e86328e9fd7f66d (commit)
via 031ce225455decf24dbff53670136fdae49cf7c1 (commit)
via fb28f35021247fbfdee428253ee2a557cac90d23 (commit)
via 887022e0d23050d586970ef306df0d5630e1dd65 (commit)
via 98f0e5047d8538f31ef9854395b5979e815f1bfb (commit)
via b2093e41620f92987c5f1a17d8b22597837f66a1 (commit)
via 6e311a1be124cc93756183aefea7768be74849ad (commit)
via e429d90fb3065a7c7c4bd6951ffb9d47135aa5ce (commit)
via bbfdc72303a2ebd5130c39c743a2d0040b2c0e2c (commit)
via 5b80d3ba6532dd0ae911ff4a7ce5f266f30dc6f8 (commit)
via b2110746d44861c55714e8bb68ab665247b6cbd8 (commit)
via 8595e80b7858c7eeb7b11a1dd33f338fce12791c (commit)
via d67b2b5d46cef3dc221c05431a5ce5f7d2563cf1 (commit)
via 07bc35615649f466674ce2e6f2534d47926b02e8 (commit)
via dc465736cd14a860ffbda1571012fe94fb1e65fa (commit)
via 6adc4514c69a5fa95ff54caf73d2542e97769863 (commit)
via 6853a2d7f6bf8795b204beeeaa65a8eb61f09308 (commit)
via aa36a4c22f81d2d20fb862baf09cd4121f82afb2 (commit)
via 9f5596afd66b1757092f252a7e9496d125e45315 (commit)
via 2d53ae88b617638215c0e2fafd6e3db1d3b8eb40 (commit)
via 9721e6775185f956e7c7808cadb81c60a61f8902 (commit)
via 0001155429a7c163d697d8950a139f14644ef940 (commit)
via 2bf1d0f1d21e7228904c0bb00f2c1388fb1a3df2 (commit)
via 8b3a1085587d3275a95a5a1a4a84591e6f3ed034 (commit)
via 4685b3de0b7433f338a617713fac66562fb3a53c (commit)
via bff3fb91eb6af3d964936640c08e2ff2d4add94a (commit)
via 0cbf32886499c26f5da650aea16de5e30a0d0390 (commit)
via a7d834d2e57144807d43b3fdb7e8a4a42151cc3a (commit)
via 47f4ae3fe7958c708bf3af887721b829ca8a8182 (commit)
via d812bf9d276b47d048b81bbe8fab3f4c913e8330 (commit)
via 6d36793174cf6f9a42f46b1109497bc0bd9bbc57 (commit)
via 10e23507f5b4c6faf202122e81175ebc033bdee6 (commit)
via 5bab8b0fec65e5b12da3545dd021509669fce5c3 (commit)
via ff0be50cded5cc2fac175a305dd3554c8463bbe8 (commit)
via 657a1a18b0657a54a9318d374b530e439c0bfbb5 (commit)
via 046e32bccc8bca83ff558126b2288e5a13c64df3 (commit)
via 080ef802e2da9ed0fecf6136b1ed8b57f3ad57e8 (commit)
via adce91dc250ac711cdeae03d84b07a8e790355f3 (commit)
via d193883868b3b223c7167b870a55b85bc1ecfa2e (commit)
via afd13b6a9b2b980872a0dc18d3fcc207f2f2cd3e (commit)
via 30af45ccf126979c0bddcc69992b7e33516dfea0 (commit)
via ccdba691ff9685a252e44a4f6e9371b97e51b518 (commit)
via 14986fce53b8bfa6fe3d597f6c255ca742ef17c5 (commit)
via 51d73f839381144aac32f11d10d2971e3d558918 (commit)
via c87ed242098a60881ef1b3777bd0d4e3307e0771 (commit)
via 78d2b65313ad188756983ea46a8f57cf4e7804db (commit)
via ed7e74307edaa767ce283b59467a982fa420bf4a (commit)
via 2baa9a1b5a844cc3f45df2cce273d3ddb92c0bc9 (commit)
via 1a7f09709abc1d89f9ff0b6ccd160c55eb139449 (commit)
via ef07ad1044e172e3b0079025ad9ea04fb074f9e0 (commit)
via 51895cd7fb5ac56d8e4a2ffb78ba2efccec3d83f (commit)
from f8206ca60cb1bbd32a90b7898a6877166026b8bb (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 f11484ae7f43092352f7b9376e86328e9fd7f66d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 14:38:12 2020 +0000
Bug 24083: DBRev 20.06.00.069
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 031ce225455decf24dbff53670136fdae49cf7c1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 15:36:26 2020 +0100
Bug 24083: Compiled CSS
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fb28f35021247fbfdee428253ee2a557cac90d23
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 15:34:51 2020 +0100
Bug 24083: DBIC schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 887022e0d23050d586970ef306df0d5630e1dd65
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Nov 11 13:19:18 2020 +0000
Bug 24083: (follow-up) Make requested changes
This commit makes the changes requested in comment #120
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 98f0e5047d8538f31ef9854395b5979e815f1bfb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 9 16:11:02 2020 +0100
Bug 24083: Swap the column for "Unlimited" handling
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b2093e41620f92987c5f1a17d8b22597837f66a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 9 16:10:39 2020 +0100
Bug 24083: Delete the new rule when needed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6e311a1be124cc93756183aefea7768be74849ad
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Oct 5 12:39:48 2020 +0100
Bug 24083: (follow-up) Squashed follow ups
This squashed commit fixes:
- a small error in the checkouts related JS
- GetRenewCount now returns 6 values when a call to it succeeds, a
failed call should also return the same number of values. This commit
adds these additional values.
- Some changes in issue.t had broken the tests for unseen renewals (the
unseen tests were using variables that had been moved out of the tests'
scope).
- Also now using Koha::CirculationRules::set_rules to set circ rules
rather than using SQL queries.
- Fixed expected number of return values from GetRenewCount
- Moved unseen tests in issue.t to the bottom of the file to remove the
risk of interference with other test circ rules.
- There was a real mess in C4/Circulation.pm due to a bad rebase back in
February. Frankly it's a wonder anything worked at all. This commit
fixes that problem and reinstates the correct patch for
C4/Circulation.pm
- Somehow I'd never noticed this before but the columns in smart-rules.tt
were misaligned when UnseenRenewals was turned off. This was due to the
display of a <td> not being conditional when it should have been. This
is now fixed.
- This commit also fixes items 1 & 2 descibed by Katrin in comment #74 ->
comment #76.
- Fixed missing check for too_unseen in opac-user.tt, this test did used
to exist but got lost during sizeable rebase a few weeks ago :-(
- Added test for too_unseen to all AUTO_RENEWAL notice templates apart
from de-DE (as previously requested by Katrin)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e429d90fb3065a7c7c4bd6951ffb9d47135aa5ce
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Oct 5 12:37:01 2020 +0100
Bug 24083: (follow-up) Include SelfCheckInModule
As highlighted by Katrin, the selfcheckin module was not aware of this
work. This commits gives it awareness of the too_unseen renew error and
the "seen" argument that can be passed to AddRenewal
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bbfdc72303a2ebd5130c39c743a2d0040b2c0e2c
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Nov 5 10:41:56 2020 +0000
Bug 24083: (follow-up) Respond to QA feedback
This patch implements changes requested by Katrin in QA feedback
(comment #38):
- Fix QA script failures
- Fix alter table column order mismatch
- Use new convention for JS strings
- Fix terminology
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5b80d3ba6532dd0ae911ff4a7ce5f266f30dc6f8
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Mar 9 16:04:46 2020 +0000
Bug 24083: (follow-up) Fix params to AddRenewal
The merging of Bug 23051 has added a paramter that can be passed to
C4::AddRenewal. This bug does also, so the offset of this bug's new
paramter was wrong. This patch fixes it.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b2110746d44861c55714e8bb68ab665247b6cbd8
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Nov 28 09:04:38 2019 +0000
Bug 24083: Add unit tests
This patch adds unit tests for unseen renewals
Signed-off-by: Sally Healey <sally.Healey at cheshirewestandchester.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8595e80b7858c7eeb7b11a1dd33f338fce12791c
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Nov 22 11:08:53 2019 +0000
Bug 24083: Add support for unseen_renewals
This patch adds support for unseen renewals.
Here we retrofit knowledge of unseen renewals and add the display of unseen
renewal counts and warnings, in addition to adding the ability to
specify a renewal as being "unseen".
The functionality added here is goverened by the UnseenRenewals syspref.
Signed-off-by: Sally Healey <sally.Healey at cheshirewestandchester.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d67b2b5d46cef3dc221c05431a5ce5f7d2563cf1
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Nov 21 14:37:05 2019 +0000
Bug 24083: Add circ rules management
This patch adds the ability to set the "Unseen renewals allowed" value
in the circulation rules
Signed-off-by: Sally Healey <sally.Healey at cheshirewestandchester.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 07bc35615649f466674ce2e6f2534d47926b02e8
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Nov 21 14:35:41 2019 +0000
Bug 24083: Required atomic updates & DB update
This patch adds:
- An "UnseenRenewals" circulation syspref that enables/disables the
functionality added in this bug
- Add unseen_renewals_allowed to circulation_rules
- A change to the issues & old_issues table schemas and corresponding
database upgrades to add issues.unseen_renewals &
old_issues.unseen_renewals
Signed-off-by: Sally Healey <sally.Healey at cheshirewestandchester.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dc465736cd14a860ffbda1571012fe94fb1e65fa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 10 14:11:10 2020 +0100
Bug 26987: (bug 23463 follow-up) Fix serial receipt if makePreviousSerialAvailable
$serialitem is not a Koha::Item there, we need to fetch the item before.
Test plan:
Turn makePreviousSerialAvailable on
Create a subscription
Receive an serial item, mark it "arrived"
Without this patch Koha explodes with
No property notforloan for Koha::Serial::Item at /usr/share/perl5/Exception/Class/Base.pm line 88
Koha::Object::set('Koha::Serial::Item=HASH(0x55dd67c75700)', 'HASH(0x55dd672cec30)') called at /kohadevbox/koha/serials/serials-edit.pl line 273
With this patch applied the notforloan and itype values are correctly
set for the new serial item.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6adc4514c69a5fa95ff54caf73d2542e97769863
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 14:38:12 2020 +0000
Bug 23019: DBRev 20.06.00.068
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6853a2d7f6bf8795b204beeeaa65a8eb61f09308
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Tue Nov 10 13:59:01 2020 -0300
Bug 23019: (follow-up) Fix test permissions and API definition bugs
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit aa36a4c22f81d2d20fb862baf09cd4121f82afb2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 9 14:46:49 2020 +0100
Bug 23019: (follow-up 2) set table name to import_batch_profiles
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9f5596afd66b1757092f252a7e9496d125e45315
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Nov 6 14:50:29 2020 -0300
Bug 23019: (follow-up) Fix other things
This patch:
* Fixes table name change
* Adds schema file
* Changes api parameter name
* Fixes string escaping
* Fixes error handling
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2d53ae88b617638215c0e2fafd6e3db1d3b8eb40
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Nov 6 14:49:20 2020 -0300
Bug 23019: (follow-up) set table name to import_batch_profiles
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9721e6775185f956e7c7808cadb81c60a61f8902
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 30 15:34:24 2020 +0000
Bug 23019: (QA follow-up) fix test fiule permissions
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0001155429a7c163d697d8950a139f14644ef940
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Thu Aug 27 19:09:05 2020 -0300
Bug 23019: (follow-up) Fix usability issues
This patch place profile buttons in the bottom of the page, next to "Stage for import"
It removes the "Update profile" button, and changes "Add profile" to "Save profile". Save profile can be used to add and to update a profile.
It also adds feedback when a profile was saved or deleted.
Last, it also replaces input-batch-profile endpoint name for input_batch_profile, which is more aligned with other endpoint names.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2bf1d0f1d21e7228904c0bb00f2c1388fb1a3df2
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Wed Jul 1 07:25:14 2020 +0000
Bug 23019: (QA follow-up) Fix typo Pre fill
Signed-off-by: Agustin Moyano <agustinmoyano 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 8b3a1085587d3275a95a5a1a4a84591e6f3ed034
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri May 15 11:09:49 2020 -0300
Bug 23019: Add profiles to stage-import-batch and magnage-import-batch pages
This patch adds the logic and the needed UI elements to be able to pre-load an import profile. It also displays which profile was used to stage an import in staged import manager.
To test:
1. Apply all patches
2. Updatedatabase
3. Go to Stage MARC records for Import tool in admin, and upload a file with MARC records.
CHECK => after uploading, there is a fieldset with the legend “Profile settings”
=> inside the fieldset there is a select labeled “Pre fill values with profile”. The only value it has is “Do not use profile”.
4. Change some settings, and set “profile 1” as profile name and click on “Add profile”
SUCCESS => The select now has the new profile selected
5. Change profile select to “Do not use profile”
SUCCESS => Default values are now displayed in the form
6. Reload the page and upload the file again
SUCCESS => the select still has the profile recently added
7. Select the profile, change some parameter in the form and set the profile name to “profile 2”, and click add profile
SUCCESS => there are two profiles now, and if you toggle between them, the parameter changes
8. Select profile 1, change one parameter and click on update profile
SUCCESS => if you toggle that profile with the other, the new parameter of the value is shown when you select profile 1
9. Select profile 2, change some parameter and click Add profile (leaving the name as profile 2)
SUCCESS => the page complains there is another profile with the same name, and asks if you want to replace it.
10. Click on accept
SUCCESS => profile 2 now has the new value in the parameter
11. Select profile 2 and change the name to profile 1
SUCCESS => the page complains there is another profile with that name, and asks if you want to replace it
12. Click on accept
SUCCESS => in profile select there is only one profile called profile 1 that has the values of profile 2
13. Select profile 1 and click remove profile
SUCCESS => there is no profile in profile select.
14. Create a profile and click on “Stage for import”
15. Go to Staged MARC management page
SUCCESS => Improt should have the name of the profile in profile column, and when you click on the file name, there should be the name of the profile in the details.
16. prove t/db_dependent/ImportBatch.t t/db_dependent/api/v1/import_batch_profiles.t
17. Sign off
Signed-off-by: Abbey Holt <aholt at dubuque.lib.ia.us>
Signed-off-by: Abbey Holt <aholt at dubuque.lib.ia.us>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4685b3de0b7433f338a617713fac66562fb3a53c
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri May 15 11:09:56 2020 -0300
Bug 23019: Add tests
Signed-off-by: Abbey Holt <aholt at dubuque.lib.ia.us>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bff3fb91eb6af3d964936640c08e2ff2d4add94a
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri May 15 11:09:51 2020 -0300
Bug 23019: Add ImportBatchesProfile schema and set is_boolean to parse_items column
Signed-off-by: Abbey Holt <aholt at dubuque.lib.ia.us>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0cbf32886499c26f5da650aea16de5e30a0d0390
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri May 15 11:09:51 2020 -0300
Bug 23019: Add koha_object_class and koha_objects_class methods to ImportBatch.pm schema
Signed-off-by: Abbey Holt <aholt at dubuque.lib.ia.us>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a7d834d2e57144807d43b3fdb7e8a4a42151cc3a
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri May 15 11:09:53 2020 -0300
Bug 23019: Update database structure and add atomic update
Signed-off-by: Abbey Holt <aholt at dubuque.lib.ia.us>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 47f4ae3fe7958c708bf3af887721b829ca8a8182
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 14:38:12 2020 +0000
Bug 20936: DBRev 20.06.00.067
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d812bf9d276b47d048b81bbe8fab3f4c913e8330
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Tue Nov 10 19:23:49 2020 -0300
Bug 20936: (follow-up) add biblio and item relation to old holds and set a limit on search holds
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6d36793174cf6f9a42f46b1109497bc0bd9bbc57
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 30 17:28:52 2020 +0000
Bug 20936: (QA follow-up) Use Branches template plugin
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 10e23507f5b4c6faf202122e81175ebc033bdee6
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Wed May 6 19:38:19 2020 -0300
Bug 20936: Add patron's hold history menu in OPAC
This patch adds patron's hold history in OPAC.
To test:
1. apply this patch
2. Find a patron, place several holds and cancel or fulfill them
3. Go to patron's opac
CHECK => There is no 'your holds history' option in menu
4. In admin preferences enable OPACHoldsHistory
5. Go back to patron's opac
SUCCESS => There is a 'your holds history' menu option
=> Holds history displays all holds
6. Change order, and list limit
SUCCESS => All controls work as expected
7. Sign off.
Signed-off-by: Todd <tgoatley at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5bab8b0fec65e5b12da3545dd021509669fce5c3
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Sun Feb 9 17:53:55 2020 -0300
Bug 20936: Add OPACHoldsHistory syspref
Signed-off-by: Kyle M Hall <kyle 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 ff0be50cded5cc2fac175a305dd3554c8463bbe8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 14:38:12 2020 +0000
Bug 22818: DBRev 20.06.00.066
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 657a1a18b0657a54a9318d374b530e439c0bfbb5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 11 15:35:33 2020 +0100
Bug 22818: DBIC schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 046e32bccc8bca83ff558126b2288e5a13c64df3
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 16 17:13:48 2020 +0200
Bug 22818: (QA follow-up) Add hint to new library ILL email setting
Copies the hints on the other email fields highlighting the existing
global pref.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 080ef802e2da9ed0fecf6136b1ed8b57f3ad57e8
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 16 17:07:26 2020 +0200
Bug 22818: (QA follow-up) Add some punctuation and terminology fixes to pref descriptions
Just branch => library and some ending punctuation.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit adce91dc250ac711cdeae03d84b07a8e790355f3
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 16 16:51:09 2020 +0200
Bug 22818: (QA follow-up) Add sample ILL notices to it-IT installer
Run: prove xt/sample_notices.t
de-DE are missing on purpose because of bug 24972.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d193883868b3b223c7167b870a55b85bc1ecfa2e
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Oct 16 15:08:59 2020 +0100
Bug 22818: (follow-up) Respond to feedback
This commit implements the feedback from Katrin in comment #103 ->
comment #108:
- Fixed rebase issue mentioned in comment #103
- Fixed ILL notice display mentioned in comment #106
- Fixed bug with metadata display, though not the issue that was
mentioned in comment #107
- Fixed buttons display mentioned in comment #107, in addition to some
more buttons suffering the same issue
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit afd13b6a9b2b980872a0dc18d3fcc207f2f2cd3e
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Oct 15 14:57:19 2020 +0100
Bug 22818: (follow-up) Respond to feedback
This commit fixes this bug, it was broken in a number of ways.
Fixes include:
- Added necessary config block in C4::Letters to enable the TT notice
syntax introduced in an earlier commit to work
- Changed template variables to refer to singular objects rather than
multiple e.g. borrowers -> borrower
- Fixed missing / misnamed variables
This commit also implements the additional syspref checks suggested by
Katrin in comment #87
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 30af45ccf126979c0bddcc69992b7e33516dfea0
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Sep 16 14:57:36 2020 +0100
Bug 22818: (QA follow-up) Add mandatory data at install time
This patch adds the data from the update script into the mandatory sql
files such that it is also populated at install time.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ccdba691ff9685a252e44a4f6e9371b97e51b518
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jul 9 11:18:26 2020 +0100
Bug 22818: (QA follow-up) Sample Notices
Convert the update notices to TT syntax and add them into the
sample_notices file.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 14986fce53b8bfa6fe3d597f6c255ca742ef17c5
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jul 9 10:25:26 2020 +0100
Bug 22818: (QA follow-up) Translation fix + Branch notices
This patch removes the hard coded 'N/A' being passed to
GetPreparedLetter and passes in the branchcode of the ILLRequest so
notices can be branch specific.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 51d73f839381144aac32f11d10d2971e3d558918
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jul 9 09:42:20 2020 +0100
Bug 22818: (QA follow-up) Template CASE correction
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 c87ed242098a60881ef1b3777bd0d4e3307e0771
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jul 9 09:14:57 2020 +0100
Bug 22818: (QA follow-up) Licence and POD fixes
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 78d2b65313ad188756983ea46a8f57cf4e7804db
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jul 9 08:40:22 2020 +0100
Bug 22818: (QA follow-up) Email addressing corrections
This patch updates the patchset to use recnetly introduced methods for
obtaining the correct inbound and reply email addresses for branches.
We also move get_staff_to_address into Koha::Library alongside
inbound_email_address and rename it to inbound_ill_address.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 ed7e74307edaa767ce283b59467a982fa420bf4a
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu May 9 15:35:07 2019 +0100
Bug 22818: Unit tests
This patch adds unit tests for the new methods in Illrequest.pm
Sponsored-by: PTFS Europe
Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon at it-tallaght.ie>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 2baa9a1b5a844cc3f45df2cce273d3ddb92c0bc9
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu May 9 12:21:27 2019 +0100
Bug 22818: Add MessageAttribut{e,es}.pm
We need to be able to access individual message attributes in tests, so
adding accessors for them
Sponsored-by: PTFS Europe
Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon at it-tallaght.ie>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 1a7f09709abc1d89f9ff0b6ccd160c55eb139449
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed May 8 10:42:22 2019 +0100
Bug 22818: Add generation and sending of notices
This patch adds the ability for ILL to send notices, both triggered by
staff and triggered by events.
Staff can trigger notices to patrons from the "Manage ILL request" screen:
- ILL request ready for pickup
- ILL request unavailable
- Place request with partners
The following notices to staff are triggered automatically:
- Request has been modified by patron
- Request has been cancelled by patron
Branches can now specify an "ILL email" address to which notices
intended to inform staff of changes to requests by patrons can be sent.
The sending of notices is controlled by a few new sysprefs:
- "ILLDefaultStaffEmail" - Fallback email address for staff ILL notices
to be sent to in the absence of a branch address
- "ILLSendStaffNotices" - To specify which staff notices should be sent
automatically when requests are manipulated by patrons
Patron notices are also controlled by the patron's messaging
preferences
Sponsored-by: PTFS Europe
Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon at it-tallaght.ie>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 ef07ad1044e172e3b0079025ad9ea04fb074f9e0
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue May 7 17:37:02 2019 +0100
Bug 22818: Add support for ILL notices
Here we're just adding ILL notices to the existing "letters"
infrastructure so notices can be displayed and edited
Sponsored-by: PTFS Europe
Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon at it-tallaght.ie>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.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 51895cd7fb5ac56d8e4a2ffb78ba2efccec3d83f
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue May 7 11:09:58 2019 +0100
Bug 22818: Add notices sysprefs and DB column
This patch adds two new sysprefs. 'ILLDefaultEmail', 'ILLSendStaffNotices' and a new column to the
branches table called 'branchillemail'. It also adds five ILL related
notices.
Here we are providing the ability for a branch to have a dedicated email
address for it's ILL staff, the idea being that any notices sent by ILL
to staff need to go to specific staff, rather than the general branch
email address. If no branch specific address is defined, the address
specified in the ILLDefaultEmail syspref is used.
We're also providing a syspref 'ILLSendStaffNotices' to allow the user to specify which
notices should be sent to staff upon certain events.
We are also providing patron messaging preferences for the two patron
bound notices
We are also providing five notices for various ILL related events.
Sponsored-by: PTFS Europe
Signed-off-by: Niamh Walker-Headon <Niamh.Walker-Headon at it-tallaght.ie>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
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 | 67 +++-
C4/ILSDI/Services.pm | 2 +-
C4/ImportBatch.pm | 10 +-
C4/Letters.pm | 7 +
C4/SIP/ILS/Transaction/Renew.pm | 1 +
Koha.pm | 2 +-
Koha/CirculationRules.pm | 3 +
Koha/Illrequest.pm | 326 ++++++++++++++-----
Koha/Illrequest/Logger.pm | 41 ++-
Koha/ImportBatch.pm | 41 +++
Koha/ImportBatchProfile.pm | 54 ++++
Koha/ImportBatchProfiles.pm | 51 +++
Koha/ImportBatches.pm | 51 +++
Koha/Library.pm | 19 ++
Koha/{Tag.pm => MessageAttribute.pm} | 8 +-
Koha/{ApiKeys.pm => MessageAttributes.pm} | 13 +-
Koha/REST/V1/Checkouts.pm | 11 +-
Koha/REST/V1/{Cities.pm => ImportBatchProfiles.pm} | 102 +++---
Koha/Schema/Result/Branch.pm | 11 +-
Koha/Schema/Result/ImportBatch.pm | 52 ++-
Koha/Schema/Result/ImportBatchProfile.pm | 197 +++++++++++
Koha/Schema/Result/Issue.pm | 12 +-
Koha/Schema/Result/OldIssue.pm | 12 +-
Koha/Schema/Result/OldReserve.pm | 24 ++
admin/branches.pl | 1 +
admin/smart-rules.pl | 3 +
api/v1/swagger/definitions.json | 6 +
api/v1/swagger/definitions/checkout.json | 4 +
.../swagger/definitions/import_batch_profile.json | 53 +++
.../swagger/definitions/import_batch_profiles.json | 6 +
api/v1/swagger/definitions/library.json | 4 +
api/v1/swagger/parameters.json | 6 +
api/v1/swagger/parameters/checkout.json | 7 +
.../swagger/parameters/import_batch_profile.json | 9 +
api/v1/swagger/paths.json | 6 +
api/v1/swagger/paths/checkouts.json | 7 +-
api/v1/swagger/paths/import_batch_profiles.json | 360 +++++++++++++++++++++
circ/renew.pl | 11 +-
ill/ill-requests.pl | 36 ++-
.../data/mysql/en/mandatory/sample_notices.yml | 234 ++++++++++++++
.../mysql/fr-CA/obligatoire/sample_notices.sql | 13 +
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 13 +
installer/data/mysql/it-IT/necessari/notices.sql | 13 +
installer/data/mysql/kohastructure.sql | 30 +-
.../sample_notices_message_attributes.sql | 4 +-
.../sample_notices_message_transports.sql | 8 +-
installer/data/mysql/mandatory/sysprefs.sql | 4 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 13 +
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 13 +
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 13 +
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 13 +
installer/data/mysql/updatedatabase.pl | 103 ++++++
.../intranet-tmpl/prog/css/src/staff-global.scss | 12 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/includes/checkouts-table.inc | 4 +
.../prog/en/includes/messaging-preference-form.inc | 3 +
.../prog/en/modules/admin/branches.tt | 4 +
.../prog/en/modules/admin/categories.tt | 3 +
.../en/modules/admin/preferences/circulation.pref | 14 +
.../prog/en/modules/admin/preferences/opac.pref | 6 +
.../prog/en/modules/admin/smart-rules.tt | 17 +-
.../prog/en/modules/circ/circulation.tt | 1 +
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 38 ++-
.../prog/en/modules/ill/ill-requests.tt | 39 +++
.../prog/en/modules/ill/log/patron_notice.tt | 6 +
.../prog/en/modules/members/moremember.tt | 1 +
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 7 +
.../prog/en/modules/tools/manage-marc-import.tt | 3 +
.../prog/en/modules/tools/stage-marc-import.tt | 182 ++++++++++-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 28 +-
.../opac-tmpl/bootstrap/en/includes/usermenu.inc | 9 +
.../bootstrap/en/modules/opac-holdshistory.tt | 185 +++++++++++
.../bootstrap/en/modules/opac-illrequests.tt | 2 +-
.../bootstrap/en/modules/opac-messaging.tt | 3 +
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 46 ++-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +
misc/cronjobs/automatic_renewals.pl | 3 +-
offline_circ/download.pl | 1 +
opac/opac-holdshistory.pl | 95 ++++++
opac/opac-illrequests.pl | 2 +
opac/opac-renew.pl | 2 +-
opac/opac-user.pl | 10 +-
opac/sco/sco-main.pl | 2 +-
serials/serials-edit.pl | 3 +-
svc/checkouts | 12 +-
svc/renew | 3 +-
t/db_dependent/Circulation.t | 32 +-
t/db_dependent/Circulation/issue.t | 50 ++-
t/db_dependent/Illrequests.t | 140 +++++++-
t/db_dependent/ImportBatch.t | 4 +
t/db_dependent/Koha/Libraries.t | 53 ++-
t/db_dependent/api/v1/import_batch_profiles.t | 241 ++++++++++++++
tools/letter.pl | 4 +
tools/manage-marc-import.pl | 2 +
tools/stage-marc-import.pl | 7 +
96 files changed, 3171 insertions(+), 225 deletions(-)
create mode 100644 Koha/ImportBatch.pm
create mode 100644 Koha/ImportBatchProfile.pm
create mode 100644 Koha/ImportBatchProfiles.pm
create mode 100644 Koha/ImportBatches.pm
copy Koha/{Tag.pm => MessageAttribute.pm} (83%)
copy Koha/{ApiKeys.pm => MessageAttributes.pm} (81%)
copy Koha/REST/V1/{Cities.pm => ImportBatchProfiles.pm} (50%)
create mode 100644 Koha/Schema/Result/ImportBatchProfile.pm
create mode 100644 api/v1/swagger/definitions/import_batch_profile.json
create mode 100644 api/v1/swagger/definitions/import_batch_profiles.json
create mode 100644 api/v1/swagger/parameters/import_batch_profile.json
create mode 100644 api/v1/swagger/paths/import_batch_profiles.json
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
create mode 100755 opac/opac-holdshistory.pl
create mode 100755 t/db_dependent/api/v1/import_batch_profiles.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list