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 88f64019536887c094b0178007d3583a048917f2 (commit)
via 352bc794d4bda2d39bdc0c9718f9cf3b31c5b070 (commit)
via 0d64db87d7764855dcb1227eeed46002a02220fc (commit)
via 1d19dccbb22b64690a7212708ef9e122276c6049 (commit)
via 94df210c415dfac39cb778b6b400449461e04b41 (commit)
via d574597473180006cf7e71679bd2f827245e2de2 (commit)
via 0a7e3a264e0b3d73cbec51e34bbd9d7b8354c315 (commit)
via ab1d71c53daafb7bd35f84101cdad5402872e0ac (commit)
via 57bbb2861f0c0e2c8eca67d40ec07f46b5a476c8 (commit)
via 563328d3cc37eb64d0eae9c268aa8312f7680e3d (commit)
via a6042768ac87794b58b858dab5b52c3252b70cdf (commit)
via 8afa136aee4a07a99d5ef0b46472391c0589f82a (commit)
via 61e00246803821dc2680ff740d7702fbef17bb60 (commit)
via 0b3f22710a45ccfcde8668494e2073ec8d51cdd8 (commit)
via 27c80187ba55e801787a591d0d867921617d8339 (commit)
via af0d71b7479432aeaf65dd61225b0d20c84cd360 (commit)
via f840342c0a5eb39dfe7aa045a85fa55cb660a213 (commit)
via deee485a24df0734cace673dc519f15d41a5b575 (commit)
via 69bdc94cd4f420094c5706fb2bfc472ba24a5054 (commit)
via 9a63cf6dec55c67491e5a2807fe74f9083167ccc (commit)
via 385a4cba44c5ac56d334d5ac4f8acd69d17375e9 (commit)
via 66382458dc46356818473935e8d5546f13f05645 (commit)
via d99651efd0a9a827b91f4575ab6f1d4344c7cfb0 (commit)
via 48edb2947163c1e9a70b11de40a71ebed747952f (commit)
via 992edc43b0c956c5f61259abfa36f0a256ad40d3 (commit)
via add2f752b9717c07cc950d315fe093dc3c6e9536 (commit)
via 3dd22f27bb7ddcc6eac729cdd938fef0a2df42e6 (commit)
via 50f3d267c15d1c0ea18fad092d61c157689d7403 (commit)
via c3bab9f414819f31f37f1f12943126a7e8abd030 (commit)
via fbd727869f54897d923c6278b8e841c623029fae (commit)
via f563c5a8e9eccad9514d758660090fef97f34805 (commit)
via 03bcf662730d46b1003b6222b61892142c6f310f (commit)
via d073755a6688aec796922c747ccb3e930ee9546c (commit)
via adbf2b7ba94b8f455cfb70ecbc1d4775b1cd964c (commit)
via 258f461cfe7021e7423ad3889c8d41a503f8e4a9 (commit)
via 182db38e22ebd366a9f05734ea3751ca15fd71dd (commit)
via 4d01e9da98bb3a166ebf102d95dfcc1b1e4c1609 (commit)
via b893504ec9faefdb48073c52b633251764b3602d (commit)
via c31989bb1f4758f0231a214f9961c82de50e5bc3 (commit)
via cae9035cf7f056dc91c89af0af6689a25339b8e2 (commit)
via b73bf7374ceed33d217498042c240a35097f37f1 (commit)
from 01bee142e6e0b997ddfb000a9623082b74bbe9ab (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 88f64019536887c094b0178007d3583a048917f2
Author: Jonathan Druart <[email protected]>
Date: Tue Aug 25 15:14:27 2020 +0200
Bug 26265: add a plan for tests
Tests were run but no plan was declared and done_testing() was not seen.
Signed-off-by: Jonathan Druart <[email protected]>
commit 352bc794d4bda2d39bdc0c9718f9cf3b31c5b070
Author: Jonathan Druart <[email protected]>
Date: Tue Aug 25 15:09:57 2020 +0200
Bug 25534: DBIC schema changes
Signed-off-by: Jonathan Druart <[email protected]>
commit 0d64db87d7764855dcb1227eeed46002a02220fc
Author: Jonathan Druart <[email protected]>
Date: Tue Aug 25 09:57:27 2020 +0000
Bug 25534: DBRev 20.06.00.029
Signed-off-by: Jonathan Druart <[email protected]>
commit 1d19dccbb22b64690a7212708ef9e122276c6049
Author: Kyle M Hall <[email protected]>
Date: Mon Aug 24 10:52:28 2020 -0400
Bug 25534: (QA follow-up) Use modal for cancel links, hide reason unless
priority is set to 'del'
Signed-off-by: Jonathan Druart <[email protected]>
commit 94df210c415dfac39cb778b6b400449461e04b41
Author: Kyle M Hall <[email protected]>
Date: Mon Aug 24 09:13:00 2020 -0400
Bug 25534: (QA follow-up) Update Koha::Hold::cancel POD
Signed-off-by: Jonathan Druart <[email protected]>
commit d574597473180006cf7e71679bd2f827245e2de2
Author: Jonathan Druart <[email protected]>
Date: Mon Aug 24 11:31:20 2020 +0200
Bug 25534: Use build_sample_item in tests
Signed-off-by: Jonathan Druart <[email protected]>
commit 0a7e3a264e0b3d73cbec51e34bbd9d7b8354c315
Author: Kyle M Hall <[email protected]>
Date: Fri Aug 21 07:24:03 2020 -0400
Bug 25534: (QA follow-up) Add sample notices for translators
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit ab1d71c53daafb7bd35f84101cdad5402872e0ac
Author: Kyle M Hall <[email protected]>
Date: Fri Aug 21 06:58:04 2020 -0400
Bug 25534: (QA follow-up) Add default values for new AV category
Signed-off-by: Katrin Fischer <[email protected]>
Bug 25534: (QA follow-up) Removed doubled insert statements in
de-DE/optional/auth_val.sql
Signed-off-by: Jonathan Druart <[email protected]>
commit 57bbb2861f0c0e2c8eca67d40ec07f46b5a476c8
Author: Kyle M Hall <[email protected]>
Date: Thu Aug 20 12:35:27 2020 -0400
Bug 25534: (QA follow-up) Add AV category
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 563328d3cc37eb64d0eae9c268aa8312f7680e3d
Author: Kyle M Hall <[email protected]>
Date: Thu Aug 20 12:30:21 2020 -0400
Bug 25534: (QA follow-up) Add label to reason pulldown
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit a6042768ac87794b58b858dab5b52c3252b70cdf
Author: Kyle M Hall <[email protected]>
Date: Thu Aug 20 12:26:46 2020 -0400
Bug 25534: (QA follow-up) Add sample notice
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 8afa136aee4a07a99d5ef0b46472391c0589f82a
Author: Kyle M Hall <[email protected]>
Date: Thu Aug 20 12:26:14 2020 -0400
Bug 25534: (QA follow-up) Unit tests
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 61e00246803821dc2680ff740d7702fbef17bb60
Author: Kyle M Hall <[email protected]>
Date: Thu Aug 20 08:16:12 2020 -0400
Bug 25534: (QA follow-up) Add missing TT filters
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 0b3f22710a45ccfcde8668494e2073ec8d51cdd8
Author: Kyle M Hall <[email protected]>
Date: Tue May 19 13:43:24 2020 -0400
Bug 25534: Add reason to pendingreserves.pl
Signed-off-by: Andrew Fuerste-Henry <[email protected]>
Signed-off-by: Rebecca Coert <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Bug 25534: (QA follow-up) Fix typo
Signed-off-by: Katrin Fischer <[email protected]>
Bug 25534: (QA follow-up) Add colon to label on pendingreserves.pl
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 27c80187ba55e801787a591d0d867921617d8339
Author: Kyle M Hall <[email protected]>
Date: Tue May 19 13:25:00 2020 -0400
Bug 25534: Use the cancelation reasion for the 'X' hold cancelation links
Signed-off-by: Andrew Fuerste-Henry <[email protected]>
Signed-off-by: Rebecca Coert <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit af0d71b7479432aeaf65dd61225b0d20c84cd360
Author: Kyle M Hall <[email protected]>
Date: Mon May 18 13:32:45 2020 -0400
Bug 25534: Add ability to send an email specifying a reason when canceling
a hold
Some libraries would like to be able to cancel a hold with the option to
specify a reason. Providing a reason would generate an email to that
patron.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Restart all the things!
4) Create new AV category "HOLD_CANCELLATION", add some cancelation reasons
5) Add new Holds module notice "HOLD_CANCELLATION", add an email version.
A quick test version would be "Reason: <<reserves.cancellation_reason>>"
--
[% USE AuthorisedValues %]
Reason: [% AuthorisedValues.GetByCode( 'CANCELLATION_REASON',
hold.cancellation_reason, 'IS_OPAC' ) %]
[% IF hold.cancellation_reason == "MY_AV_VALUE" %]
IF perhaps you'd like to have a much longer explanation than just the
one sentence in the AV description, you can use IF blocks using Template
Toolkit markup!
[% END %]
--
6) Place a hold for a patron
7) On request.pl, select the 'del' option for the hold
8) Select a cancellation reason and choose "Update hold(s)"
9) Note a new message has been queue for the patron with the cancelation
reason
11) Test again from circulation.pl
12) Test again from moremember.pl
10) Cancel a hold with no reason, note no email is generated
11) Delete your authorised values, not the feature is disabled
12) Reinstate the authorised values, but delete the notice,
you should now be able to cancel a hold with a reason,
but no email will be generated
Signed-off-by: Andrew Fuerste-Henry <[email protected]>
Signed-off-by: Rebecca Coert <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit f840342c0a5eb39dfe7aa045a85fa55cb660a213
Author: Kyle M Hall <[email protected]>
Date: Mon May 18 13:32:21 2020 -0400
Bug 25534: Update database
Signed-off-by: Andrew Fuerste-Henry <[email protected]>
Signed-off-by: Rebecca Coert <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit deee485a24df0734cace673dc519f15d41a5b575
Author: Tomas Cohen Arazi <[email protected]>
Date: Tue Jun 23 10:35:54 2020 -0300
Bug 25662: (follow-up) Add tests for the wrong patron_id added behaviour
This patch adds trivial tests for the new error (400) raised when the
passed patron_id doesn't exist.
To test:
1. Run:
$ kshell
k$ prove t/db_dependent/api/v1/holds.t
=> SUCCESS: Tests pass!
2. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Kyle M Hall <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 69bdc94cd4f420094c5706fb2bfc472ba24a5054
Author: Tomas Cohen Arazi <[email protected]>
Date: Tue Jun 23 10:33:14 2020 -0300
Bug 25662: Make the route for holds restpect maxreserves
This patch fixes the behaviour for the POST /holds route. It assumed
maxreserves was checked in CanItemBeReserved which is not the case.
Tests are added to check for this behaviour.
To test:
1. Apply the regression tests
2. Run:
$ kshell
k$ prove t/db_dependent/api/v1/holds.t
=> FAIL: Tests fail!
3. Apply this patch
4. Repeat 2
=> SUCCESS: Tests pass!
5. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Kyle M Hall <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 9a63cf6dec55c67491e5a2807fe74f9083167ccc
Author: Tomas Cohen Arazi <[email protected]>
Date: Tue Jun 23 10:11:58 2020 -0300
Bug 25662: Regression tests
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Kyle M Hall <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 385a4cba44c5ac56d334d5ac4f8acd69d17375e9
Author: Jonathan Druart <[email protected]>
Date: Tue Aug 25 09:57:27 2020 +0000
Bug 25958: DBRev 20.06.00.028
Signed-off-by: Jonathan Druart <[email protected]>
commit 66382458dc46356818473935e8d5546f13f05645
Author: Kyle M Hall <[email protected]>
Date: Mon Aug 24 13:13:17 2020 -0400
Bug 25958: (QA follow-up) Implement filter in database query instead of in
loop
Signed-off-by: Jonathan Druart <[email protected]>
commit d99651efd0a9a827b91f4575ab6f1d4344c7cfb0
Author: Katrin Fischer <[email protected]>
Date: Sat Aug 22 02:41:20 2020 +0000
Bug 25958: (QA follow-up) Add some punctuation to new
DefaultLongOverdueSkipLostStatuses
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 48edb2947163c1e9a70b11de40a71ebed747952f
Author: Kyle M Hall <[email protected]>
Date: Tue Jul 28 07:55:18 2020 -0400
Bug 25958: Allow LongOverdue cron to exclude specified lost values
When lost items are not marked as returned, they are still subject to
the long overdue cron, so an item that has already been marked Lost may
automatically roll to Long Overdue. In some cases, a library may not
want that lost value to change. This becomes especially important with
the introduction of Claims Returned, which uses a variety of lost.
Test Plan:
1) Set up a long overdue item that would be moved to lost by longoverdue.pl
2) Run the cronjob with the new --skip-lost-value option
3) Note the item is not altered
4) Include that value in the new system preference
DefaultLongOverdueSkipLostStatuses
5) Run the cronjob *without* the new option
6) Note the item is not altered
7) Run the cronjob again with the new command line option, but set it to
a different value so the item will be affected
8) Note the item is altered as it would have been before this patch was
applied
Signed-off-by: Lisette Scheer <[email protected]>
Signed-off-by: Rebecca Coert <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 992edc43b0c956c5f61259abfa36f0a256ad40d3
Author: Jonathan Druart <[email protected]>
Date: Tue Aug 25 11:38:32 2020 +0200
Bug 23166: Early return if no set
It prevents valid_template check to raise
Can't call method "filter_by_current" without a package or object reference
at /kohadevbox/koha/Koha/Template/Plugin/Context.pm line 49.
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit add2f752b9717c07cc950d315fe093dc3c6e9536
Author: Jonathan Druart <[email protected]>
Date: Fri Aug 7 12:01:10 2020 +0200
Bug 26139: Centralize code for "Place hold" button (detail)
There is a "norequest" boolean passed to the include cat-toolbar.inc, to
display or not the "Pace hold" button.
This flag was not calculated in some place (ISBDdetail and moredetail
for instance)
Here we centralize the code to make it more robust and less regression
prone.
Note that the same problem appears at the OPAC (opac-MARCdetail is
always display the button). That will have to be fixed separately
Test plan:
Create biblio A with 0 item, B and C with 1 item and D with 2 items
item for B is not for loan, C is for loan and D has 1 of each
Go to the bibliographic detail page of each record and confirm that the
"Place hold" button appears appropriately.
Test the different tabs of the catalogue module
QA note: This patch is only centralizing the existing code, but it is
still too naive. To manage the visibility of this button we certainly
want to copy what is done in C4::Search::searchResults:
# can place a hold on a item if
# not lost nor withdrawn
# not damaged unless AllowHoldsOnDamagedItems is true
# item is either for loan or on order (notforloan < 0)
$can_place_holds = 1
if (
!$item->{itemlost}
&& !$item->{withdrawn}
&& ( !$item->{damaged} ||
C4::Context->preference('AllowHoldsOnDamagedItems') )
&& ( !$item->{notforloan} || $item->{notforloan} < 0 )
);
Signed-off-by: Didier Gautheron <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 3dd22f27bb7ddcc6eac729cdd938fef0a2df42e6
Author: Joonas Kylmälä <[email protected]>
Date: Mon Aug 24 18:34:10 2020 +0300
Bug 23166: (QA follow-up) Add POD text
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 50f3d267c15d1c0ea18fad092d61c157689d7403
Author: Jonathan Druart <[email protected]>
Date: Tue May 5 15:51:25 2020 +0200
Bug 23166: Call the methods from the .inc
We do not longer need the order variables to be passed from the
controllers, we can call the methods on the biblio object instead.
There is something wrong with our ->search method and TT behaviours, it
is hard to retrieve object list in a scalar context.
If [% objects.method.count %] is called, objects.method will get the
first object of the list and count will explode (Koha::Object->count
does not exist)
We need to force the call in a scalar context to retrieve an iterator
and prevent to fetch all the objects (we could have called all then
size, but it's not efficient)
If adopted I will move the plugin on a separate bug report to ease
backport
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit c3bab9f414819f31f37f1f12943126a7e8abd030
Author: Jonathan Druart <[email protected]>
Date: Tue May 5 15:50:17 2020 +0200
Bug 23166: Add filter_by_current and _cancelled Koha::Acq::Orders methods
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit fbd727869f54897d923c6278b8e841c623029fae
Author: Jonathan Druart <[email protected]>
Date: Tue May 5 15:27:28 2020 +0200
Bug 23166: Remove filtering from controllers
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit f563c5a8e9eccad9514d758660090fef97f34805
Author: Jonathan Druart <[email protected]>
Date: Wed Jun 19 21:35:20 2019 -0500
Bug 23166: Replace the count of orders with Koha::Acq::Orders
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 03bcf662730d46b1003b6222b61892142c6f310f
Author: Jonathan Druart <[email protected]>
Date: Wed Jun 19 21:11:20 2019 -0500
Bug 23166: Remove baskets_deletedorders code
This is never used.
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit d073755a6688aec796922c747ccb3e930ee9546c
Author: Jonathan Druart <[email protected]>
Date: Wed Jun 19 21:10:15 2019 -0500
Bug 23166: Remove baskets_orders code
This is never used.
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Joonas Kylmälä <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit adbf2b7ba94b8f455cfb70ecbc1d4775b1cd964c
Author: Nick Clemens <[email protected]>
Date: Mon Aug 24 12:26:04 2020 +0000
Bug 25033: (follow-up) Don't limit suggestions to branches if displaying by
branch
In the case of organizing by branches we should not filter by branch
Signed-off-by: Jonathan Druart <[email protected]>
commit 258f461cfe7021e7423ad3889c8d41a503f8e4a9
Author: Katrin Fischer <[email protected]>
Date: Sat Aug 22 13:24:06 2020 +0000
Bug 25033: Fix number of tests
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 182db38e22ebd366a9f05734ea3751ca15fd71dd
Author: Nick Clemens <[email protected]>
Date: Wed Aug 5 11:50:39 2020 +0000
Bug 25033: (follow-up) Don't delete branchcode key from suggestion_ref
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit 4d01e9da98bb3a166ebf102d95dfcc1b1e4c1609
Author: Nick Clemens <[email protected]>
Date: Fri May 15 12:25:05 2020 +0000
Bug 25033: (follow-up) Deal with 'Any' branch and don't show dropdown if
organized by library
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit b893504ec9faefdb48073c52b633251764b3602d
Author: Jonathan Druart <[email protected]>
Date: Tue May 5 12:33:37 2020 +0200
Bug 25033: Improve JS code a bit
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit c31989bb1f4758f0231a214f9961c82de50e5bc3
Author: Nick Clemens <[email protected]>
Date: Wed Apr 1 13:39:13 2020 +0000
Bug 25033: Move branchfilter to top of page
There is confusion becase it is not obvious when the suggestions page is
being limited to a branch
Moving the branch filter to the top of the page makes it easier to see
To test:
1 - Apply patch
2 - From mainpage or acqui-home note the link to suggestions takes you to
suggestions limited to current branch
3 - Change the dropdown
4 - Note the page refreshes and loads the correct suggestions
Signed-off-by: Owen Leonard <[email protected]>
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit cae9035cf7f056dc91c89af0af6689a25339b8e2
Author: Nick Clemens <[email protected]>
Date: Wed Apr 1 12:46:17 2020 +0000
Bug 25033: Remove CountSuggestion
Signed-off-by: Owen Leonard <[email protected]>
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
commit b73bf7374ceed33d217498042c240a35097f37f1
Author: Nick Clemens <[email protected]>
Date: Wed Apr 1 12:38:02 2020 +0000
Bug 25033: Display both local and all pending suggestions counts if the
numbers differ
To test:
0 - Be in staff client as a superlibrarian
1 - Place some suggestions
1 for any branch
1 for signed in branch
1 for another branch
2 - Go to Koha main page, 3 suggestions pending
3 - Click 'Suggestions pending approval' - you see one suggestion
4 - Click on 'Acquisitions' in breadcrumbs , 3 suggestions pending
5 - Click manage suggestions - you see one suggestion
6 - Apply patch
7 - On mainpage and acqui-home you now see "Centerville: 1 / All
libraries: 3" suggestions
8 - Confirm that the links take you to suggestions view of your branch or
all libraries respectively
9 - Turn on IndependentBranches
10 - Create a user with acquisition and suggestions permissions but not
superlibrarian in one of the branches used above
11 - Sign in as that user
11 - See "Centerville: 1" suggestion on mainpage and on acqui home
Signed-off-by: David Nind <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Jonathan Druart <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 9 +-
C4/Suggestions.pm | 56 ----------
Koha.pm | 2 +-
Koha/Acquisition/Orders.pm | 35 ++++++
Koha/Hold.pm | 41 ++++++-
Koha/Items.pm | 13 +++
Koha/REST/V1/Holds.pm | 12 +++
Koha/Schema/Result/OldReserve.pm | 12 ++-
Koha/Schema/Result/Reserve.pm | 12 ++-
Koha/{ActionLogs.pm => Template/Plugin/Context.pm} | 36 +++----
acqui/acqui-home.pl | 18 +++-
catalogue/ISBDdetail.pl | 29 -----
catalogue/MARCdetail.pl | 38 +------
catalogue/detail.pl | 36 -------
catalogue/imageviewer.pl | 39 -------
catalogue/labeledMARCdetail.pl | 31 +-----
catalogue/moredetail.pl | 30 +-----
circ/pendingreserves.pl | 3 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +
installer/data/mysql/de-DE/optional/auth_val.sql | 4 +
.../data/mysql/en/mandatory/sample_notices.yml | 13 +++
installer/data/mysql/en/optional/auth_val.yml | 9 ++
installer/data/mysql/fr-CA/facultatif/auth_val.sql | 4 +
.../mysql/fr-CA/obligatoire/sample_notices.sql | 2 +
.../fr-FR/1-Obligatoire/authorised_values.sql | 4 +
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +
installer/data/mysql/it-IT/necessari/auth_val.sql | 4 +
installer/data/mysql/it-IT/necessari/notices.sql | 2 +
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/mandatory/auth_val_cat.sql | 1 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +
.../data/mysql/nb-NO/2-Valgfritt/auth_val.sql | 4 +
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +
installer/data/mysql/pl-PL/optional/auth_val.sql | 4 +
.../authorised_values_[HOLD_CANCELLATION].sql | 2 +
.../authorised_values_[HOLD_CANCELLATION].txt | 1 +
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +
installer/data/mysql/sysprefs.sql | 1 +
.../authorised_values_[HOLD_CANCELLATION].sql | 2 +
.../authorised_values_[HOLD_CANCELLATION].txt | 1 +
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +
installer/data/mysql/updatedatabase.pl | 35 ++++++
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 5 +-
.../prog/en/includes/catalog-strings.inc | 8 +-
.../intranet-tmpl/prog/en/includes/holds_table.inc | 10 +-
.../prog/en/modules/acqui/acqui-home.tt | 13 ++-
.../prog/en/modules/admin/authorised_values.tt | 2 +
.../en/modules/admin/preferences/circulation.pref | 6 ++
.../prog/en/modules/circ/circulation.tt | 10 ++
.../prog/en/modules/circ/pendingreserves.tt | 18 +++-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 13 ++-
.../prog/en/modules/members/moremember.tt | 11 ++
.../prog/en/modules/reserve/request.tt | 75 ++++++++++++-
.../prog/en/modules/suggestion/suggestion.tt | 33 +++---
mainpage.pl | 21 +++-
misc/cronjobs/longoverdue.pl | 73 ++++++++-----
reserve/modrequest.pl | 2 +
reserve/request.pl | 3 +-
suggestion/suggestion.pl | 11 +-
t/db_dependent/Koha/Acquisition/Order.t | 50 ++++++++-
t/db_dependent/Koha/Holds.t | 120 ++++++++++++++++++++-
t/db_dependent/Koha/Items.t | 15 ++-
t/db_dependent/Suggestions.t | 14 +--
t/db_dependent/api/v1/holds.t | 103 +++++++++++++++++-
xt/check_makefile.t | 1 +
65 files changed, 806 insertions(+), 370 deletions(-)
copy Koha/{ActionLogs.pm => Template/Plugin/Context.pm} (63%)
create mode 100644
installer/data/mysql/ru-RU/authorised_values/authorised_values_[HOLD_CANCELLATION].sql
create mode 100644
installer/data/mysql/ru-RU/authorised_values/authorised_values_[HOLD_CANCELLATION].txt
create mode 100644
installer/data/mysql/uk-UA/authorised_values/authorised_values_[HOLD_CANCELLATION].sql
create mode 100644
installer/data/mysql/uk-UA/authorised_values/authorised_values_[HOLD_CANCELLATION].txt
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
[email protected]
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits