[koha-commits] main Koha release repository branch master updated. v19.11.00-1453-g7ce4122131
Git repo owner
gitmaster at git.koha-community.org
Wed Mar 25 11:09:57 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 7ce4122131a6c3d7f0fe7c953dc95fd5d831bf7f (commit)
via b1523255a8c53d50175ac55f94330995663e6937 (commit)
via 18ad5f5eea8aab8414783f4b75408cfebd2518da (commit)
via d3a37911cfbddfa99f50d06e9c423a4a05e89557 (commit)
via edef63e5a890a80d4cd9b02a4b6cbd7fe3d72890 (commit)
via 7ecd21a1e463db9c504b0d8929b11f7cfdcdb031 (commit)
via a0b8805ce39fb5ea8ba147466f82f5af41815cd0 (commit)
via 3edf95f6b0e419842a71f1fbb52abeb240e63ff7 (commit)
via a55f89c4beb57d866237dfbf5f51b079c756f20c (commit)
via 2eff7c0faff8faf73200d173f2f893ef52ea0b25 (commit)
via 0d1ca63aada1c471baabb7d55d3963895e819921 (commit)
via 822936b79b93ebf5485f6512a4e4e665e3efd7c5 (commit)
via 565fb64783bb83dca108755c9c7c897349667aa5 (commit)
via f148272e0636e478d89951fab06a88ba203a2c4b (commit)
via 5ce2d5cb7fb5e47e12554b9483459329ec693b91 (commit)
via 39e127b000554d403788ff1107c9241c0cbafef0 (commit)
via c023185a8846564b9337d1156085547360480dcd (commit)
via 9a956d7f97b0ce2cd7e18d50a4d405ce7fc2fe19 (commit)
via dbdcae1ccbd52334121b5a3ecb827c3c17b6c8a7 (commit)
via def0cd93b29eab3732c925dbd8c6a214d6638f25 (commit)
via 1a36c26ac5a49c812a6e5efbb77610757dbf77e9 (commit)
via cdcb7474b9c73f3707257477fe6b7b2c1a3b0023 (commit)
via d2de3d34de4d2e49e53a1ecd9e73a78828659f30 (commit)
via 91b9c09bf2d96ae88a299d37891f8b0dc10abd0b (commit)
via 0370e0dcd2585c3de0245718c6da43ad86f82ae8 (commit)
via efa3525c8df4650ae057a8d8e61e6200b0c461f0 (commit)
via 2754423879e289046b35dcd18c9cbc04a1f7252a (commit)
via b3ecb4644ef3cd953df3a3bff75d8d4e26ad58d4 (commit)
via de7a1ff61e586f7388ff0423d53d89038f16da70 (commit)
via 9d5eba32e6b915062e1d3e7f2939448946c4fc3b (commit)
via da6d7f5e3345bc64bc40dd5e6cf9df8351fdb5e4 (commit)
via bc25e2c1008e322ed446bc79273ff5b90e92578b (commit)
via de5a0b15a39fba67242fd90b16453717c6d340e5 (commit)
via 50e476d00fb9ebd1fe0ee37c8a8a89b1ab6901a3 (commit)
via 0b602048a224f8538ff014b446eaa7af548e06f2 (commit)
via c5f4a558c6cfe054de3b5d624431444d2cfd2c46 (commit)
via 730519ed5ca75b8a703fd05f5d61e0d8fc4bbafc (commit)
from e0bc64cae79c73a82e927762e62efc8450bfe8a9 (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 7ce4122131a6c3d7f0fe7c953dc95fd5d831bf7f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 24 12:42:11 2020 +0000
Bug 24745: (follow-up) Correct return statement in news plugin
Subroutine should "return;" instead of "return 0;"
We also prevent ProhibitExplicitReturnUndef by not returning "undef"
explicitly.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b1523255a8c53d50175ac55f94330995663e6937
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 27 01:31:37 2020 +0000
Bug 24745: OPAC news block plugin should evaluate as false if there are no items
This patch changes the way news is returned from GetNewsToDisplay in
KohaNews.pm so that the template variable will evaluate as false instead
of simply being an empty data structure.
To verify the bug, remove your opacheader news entry and view source on
any page in the OPAC. You should find some empty markup right after
'</div> <!-- /navbar -->'
<div class="container-fluid">
<div class="row-fluid">
</div>
</div>
To test the fix, apply the patch and reload the OPAC page. The empty
divs should be gone. Add content to the opacheader news item and confirm
that it displays correctly.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 18ad5f5eea8aab8414783f4b75408cfebd2518da
Author: Andrew Nugged <nugged at gmail.com>
Date: Wed Jan 15 00:50:49 2020 +0200
Bug 24185: Make holds page fast when 'on shelf holds' set to 'If all unavailable'
When "reserve/request.pl -> C4/Reserves.pm::IsAvailableForItemLevelRequest" called many times with hundred of items and "on shelf holds" parameter set to "If all unavailable" for these items + patron, it goes slow.
It happens because in subloop it is checking if all items available so it is O(n^2) and it re-checks each time the same info for each item with repeating DB/data requests.
Fix:
The inner loop 1:1 picked out into separate subroutine and called outside of the loop, saving data in 'items_any_available' variable once, this variable passed to IsAvailableForItemLevelRequest to be used inside as the precalculated result.
This made algorithm O(n) instead of O(n^2) so there is noticeable speed increase.
How to reproduce:
1) on freshly installed kohadevbox create/import one book,
remember that biblionumber for later use it in down below,
2) add 100 items for that book for some library,
3) find some patron, that patron's card number we will
use as a borrower down below to open holds page,
4) check for the rule or set up a single circulation rule
in admin "/cgi-bin/koha/admin/smart-rules.pl",
that rule should match above book items/library/patron,
check that rule to have a non-zero number of holds (total, daily, count) allowed,
and, IMPORTANT: set up "On shelf holds allowed" to "If all unavailable",
("item level holds" doesn't matter).
5) open "Home > Catalog > THAT_BOOK > Place a hold on THAT_BOOK" page
("holds" tab), and enter patron code in the search field,
or you can create a direct link by yourself, for example, in my case it was:
/cgi-bin/koha/reserve/request.pl?biblionumber=4&findborrower=23529000686353
6) it should be pretty long page generation time on old code, densely increasing for every hundred items added. In the case of this solution, it's fast, and time increases a little only, linear.
I tested on my computer in VirtualBox for page generation times,
did 3-5 runs for same case to check if results are stable, and got such values:
(old code):
100 items: 50 seconds
200 items: 3.2 minutes
300 items: 7.3 minutes
(version with fix):
100 items: 4.4 seconds
200 items: 7.5 seconds
300 items: 10.4 seconds
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d3a37911cfbddfa99f50d06e9c423a4a05e89557
Author: Andrew Nugged <nugged at gmail.com>
Date: Tue Jan 14 22:51:57 2020 +0200
Bug 24185: Make holds page faster: Preparatory refactoring
This is just refactoring. extracting logically independent code
to separate sub + tests update. No logic change yet.
Searching for "any_available" item among all biblionumber items was done
inside of "elsif on_shelf_holds == 2", and it is logically very independent
piece of code (this "@items" loop), it needs just biblionumber and patron
as parameters so it can be extracted into separate subroutine, and
later also called/reused from somewhere else.
This ability to call from another place also made for future patch
to remove O(n^2) problem with nested loops.
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit edef63e5a890a80d4cd9b02a4b6cbd7fe3d72890
Author: Andrew Nugged <nugged at gmail.com>
Date: Thu Dec 19 18:20:24 2019 +0200
Bug 24185: Make holds page faster - Call to subroutine moved below "if"
`$on_shelf_holds` was assigned before "return .. if" but not used in that code piece,
so sometimes it was useless. Moved assignment after "return .. if".
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7ecd21a1e463db9c504b0d8929b11f7cfdcdb031
Author: Andrew Nugged <nugged at gmail.com>
Date: Thu Dec 19 18:16:33 2019 +0200
Bug 24185: Make holds page faster - Improved "if"
`$can_item_be_reserved eq 'OK'` moved in `&&` before `IsAvailableForItemLevelRequest`
to cut away with static known values before calling to more resource consuming subroutine.
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a0b8805ce39fb5ea8ba147466f82f5af41815cd0
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Mar 25 09:38:32 2020 +0000
Bug 23590: DBRev 19.12.00.055
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3edf95f6b0e419842a71f1fbb52abeb240e63ff7
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Mar 24 14:53:26 2020 +0000
Bug 23590: (QA follow-up) Fix links to patron records (TT variable confusion)
Fixes links to the patron accounts from the edit and list view of
suggestions.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a55f89c4beb57d866237dfbf5f51b079c756f20c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 24 13:05:19 2020 +0100
Bug 23590: DBIC Changes
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2eff7c0faff8faf73200d173f2f893ef52ea0b25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 24 12:12:06 2020 +0100
Bug 23590: Fix 'select manager' when creation a suggestion
On creating the TT var managedby_patron does not exist yet
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0d1ca63aada1c471baabb7d55d3963895e819921
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 18:46:22 2020 +0100
Bug 23590: Create a separate template notice NOTIFY_MANAGER
To separate the two feature we want to create a distinct template
notice.
A new NOTIFY_MANAGER notice is added.
A follow-up patch will be added for other languages, when this one will
be approved by QA.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 822936b79b93ebf5485f6512a4e4e665e3efd7c5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 18:31:05 2020 +0100
Bug 23590: Fix ergonomic issue if last modification by is empty
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 565fb64783bb83dca108755c9c7c897349667aa5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 18:21:56 2020 +0100
Bug 23590: Update new fields with relevant values
We are filling lastmodificationdate and lastmodificationby depending on
the max dates between manageddate, accepteddate and rejecteddate
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f148272e0636e478d89951fab06a88ba203a2c4b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 3 11:19:46 2020 +0100
Bug 23590: Remove unused variable
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5ce2d5cb7fb5e47e12554b9483459329ec693b91
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Jan 31 21:18:29 2020 +0000
Bug 23590: (QA follow-up) Fix some problems created by recent changes and updatedatabase statement
- Ensure that the sequence of columns will be the same for new
and updated installations (add AFTER ...)
- Fix permissions (see bug 22868)
- Fix column configuration (see 16784)
- Remove '- ' displying before the date
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 39e127b000554d403788ff1107c9241c0cbafef0
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 31 14:35:39 2020 +0000
Bug 23590: (QA follow-up) Add missing filters and drop script type
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c023185a8846564b9337d1156085547360480dcd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 13 17:49:59 2019 +0100
Bug 23590: Fix select manager on list for all tabs
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9a956d7f97b0ce2cd7e18d50a4d405ce7fc2fe19
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 13 16:39:18 2019 +0100
Bug 23590: Remove JS error on the suggestion list
The notify option is only available from the edit view
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dbdcae1ccbd52334121b5a3ecb827c3c17b6c8a7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 13 15:55:19 2019 +0100
Bug 23590: Add atomic update file
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit def0cd93b29eab3732c925dbd8c6a214d6638f25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 7 15:32:50 2019 +0100
Bug 23590: Add lastmodification by and date columns
No tests are provided for the changes made to SearchSuggestion. It is
going to be remove very soon as it is super ugly...
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1a36c26ac5a49c812a6e5efbb77610757dbf77e9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 7 14:42:12 2019 +0100
Bug 23590: Add the ability to notify a new manager
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cdcb7474b9c73f3707257477fe6b7b2c1a3b0023
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 19:59:21 2019 +0100
Bug 23590: Only return patrons that have the suggestions_manage permission
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d2de3d34de4d2e49e53a1ecd9e73a78828659f30
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 19:41:36 2019 +0100
Bug 23590: Batch update manager for suggestions
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 91b9c09bf2d96ae88a299d37891f8b0dc10abd0b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 19:17:32 2019 +0100
Bug 23590: Cleaning - Remove op_* vars
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0370e0dcd2585c3de0245718c6da43ad86f82ae8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 19:16:57 2019 +0100
Bug 23590: Clean TT variables for patrons
Just a bit of cleaning
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit efa3525c8df4650ae057a8d8e61e6200b0c461f0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 6 19:05:05 2019 +0100
Bug 23590: Add ability to edit the manager of a suggestion
Prior to this patch there was an hidden behavior that set the manager to
the logged in user when a suggestion was edited. This patch proposes to
let the librarian pick another manager.
Other small adjustements will be added to polish this new behavior:
* Create 2 new DB columns: suggestions.lastmodificationby and
suggestion.lastmodificationdate
* Choose a manager when editing a suggestion
* Batch modify suggestions and set a manager for them
* Let notify the new manager using the TO_PROCESS letter
* Display the manageddate, lastmodificationby and lastmodificationdate
info where appropriate
This first patch adds a new "Select manager" link when editing a
suggestion.
Test plan for the whole patchset:
0/
a. Execute the update DB entry, generate the new DBIC file and restart all
b. Create at least 2 patrons with the suggestions_manage permission
1/ Submit a new suggestion (OPAC or staff, not important)
2/ Accept it
3/ Edit it
=> "Last modification by" is empty
=> You see that you are the manager of this suggestion
4/ Click "Select manager" and search for a new manager
=> The patron search will only display patrons with the
suggestions_manage permission
5/ Save
6/ Edit again
=> The manager is set to you, but there is a note saying that previously
it was the patron you picked
=> The "Last modification by" is set to you
7/ Click "Keep existing manager"
=> The manager is now set to the previous manager
8/ Select another manager (which has a valid email address defined)
9/ Click the "notify" checkbox
10/ Save
11/ Confirm that a TO_PROCESS notice has been generated into the
message_queue table
12/ Create at least one other suggestion
13/ List the suggestions
=> There is a 4th action column to assign a manager to several
suggestions in one go.
14/ Use this new button and confirm that it works as expected
15/ Go to your purchase suggestion list (OPAC and staff)
=> You see the "managed date" displayed in a new column
Sponsored-by: BULAC - http://www.bulac.fr/
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2754423879e289046b35dcd18c9cbc04a1f7252a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 20 12:38:29 2020 +0000
Bug 24754: (QA follow-up) Add timestamp, remove 11th parameter
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b3ecb4644ef3cd953df3a3bff75d8d4e26ad58d4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 28 14:46:37 2020 +0000
Bug 24754: Set userenv for ilsdi requests
Currently ILSDI scripts do not have a userenv set. This affects both
action_logs and statistics.
For action_logs we either get no user or, if there is an active session, we use that one. This can have unintended consequences and we should explicitly set the env so that system user (0) is recorded
For statistics we need to specify a branch to record for actions like renewals. With bug 24759 we add an items method for this. We should take advantage of this method and use the 'opac' interface as the ilsdi scripts live there.
To test:
1 - Enable ILSDI in systempreferences
2 - Checkout an item to a patron
3 - Enable Renewal logs
4 - Ensure you will be able to renew the item several times
5 - Open an incognito/private browser
6 - Renew item via ilsdi:
http://localhost:8080/cgi-bin/koha/ilsdi.pl?service=RenewLoan&patron_id=5&item_id=1128
7 - Check action logs, interface may be random, user should be 0, if not make sure the user in step 9 is a different one
8 - In private browser open a new tab
9 - Sign in to staff client
10 - Return to other tab
11 - Refresh page to repeat renewal
12 - Check action_logs
13 - The second renewal indicates it was renewed via intranet by logged in staff member
14 - Apply patch
15 - restart_all
16 - Ensure staff client still signed in
17 - Repeate renewal again
18 - Check logs, renewal now indicates opac again (as it should), user is 0 even if logged in on other tab
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit de7a1ff61e586f7388ff0423d53d89038f16da70
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 24 12:15:26 2020 +0000
Bug 22771: (QA follow-up) Fix POD
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9d5eba32e6b915062e1d3e7f2939448946c4fc3b
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Fri Mar 6 14:07:53 2020 +0100
Bug 22771: Fix mistakes in list of nonfiling character fields
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit da6d7f5e3345bc64bc40dd5e6cf9df8351fdb5e4
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Wed Feb 26 16:14:36 2020 +0100
Bug 22771: Respect nonfiling indicators for search fields
Strip initial characters from search fields in accordance with
nonfiling character indicators.
To test:
1) Apply patch
2) Run tests in t/Koha/SearchEngine/Elasticsearch.t
3) All tests should pass
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bc25e2c1008e322ed446bc79273ff5b90e92578b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Mar 25 09:28:16 2020 +0000
Bug 13881: DBRev 19.12.00.054
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit de5a0b15a39fba67242fd90b16453717c6d340e5
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Wed Oct 2 14:28:43 2019 +0200
Bug 13881: Update Schema
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 50e476d00fb9ebd1fe0ee37c8a8a89b1ab6901a3
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Mar 24 11:24:52 2020 +0000
Bug 13881: (QA follow-up) Some documentation and terminology fixes
- Branchcode = Library
- Desk id = Desk ID
- Show library name on desk list and when deleting desk instead of code
- Some small changes to the database documentation.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0b602048a224f8538ff014b446eaa7af548e06f2
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Mar 24 11:24:33 2020 +0000
Bug 13881: (QA follow-up) Check for manage_libraries permission
The .pl was checking for a new permission desks_management not
(yet) added. As the templates already checked for manage_libraries
the .pl was changed accordingly to also use it.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c5f4a558c6cfe054de3b5d624431444d2cfd2c46
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Wed Oct 2 14:09:21 2019 +0200
Bug 13881: Add desk management
Add a desk and linked it to a library (branch). That's it. In the
future it'll have super features like being able to link waiting
reserve to a specific desk.
Test plan:
1. go to the administration page and notice there isn't any mention of
desk whatsoever
2. apply patches
3. ./installer/data/mysql/updatedatabase.pl
4. prove t/db_dependent/Koha/Desks.t
5. you now have desks links in admin-home and admin-menu
6. click the link
7. add a desk
8. add another one
9. delete one
10. you should have a fair list of all current desks defined
11. Done
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 730519ed5ca75b8a703fd05f5d61e0d8fc4bbafc
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Wed Oct 2 14:25:50 2019 +0200
Bug 13881: Datebase changes, kohastructure and atomicupdate
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 81 +++++---
C4/Suggestions.pm | 3 +
Koha.pm | 2 +-
.../Koha/Plugins/z_reset.t => Koha/Desk.pm | 37 +++-
Koha/{REST/V1/CirculationRules.pm => Desks.pm} | 43 +++--
Koha/Schema/Result/Borrower.pm | 19 +-
Koha/Schema/Result/Branch.pm | 19 +-
.../Result/{BranchesOverdrive.pm => Desk.pm} | 46 ++---
Koha/Schema/Result/Suggestion.pm | 40 +++-
Koha/SearchEngine/Elasticsearch.pm | 104 +++++++++--
Koha/Template/Plugin/KohaNews.pm | 16 +-
admin/columns_settings.yml | 4 +
admin/{cities.pl => desks.pl} | 74 ++++----
.../data/mysql/en/mandatory/sample_notices.yml | 17 ++
installer/data/mysql/kohastructure.sql | 17 ++
installer/data/mysql/updatedatabase.pl | 64 +++++++
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 1 +
.../prog/en/includes/desks-admin-search.inc | 31 ++++
.../prog/en/modules/admin/admin-home.tt | 2 +
.../intranet-tmpl/prog/en/modules/admin/desks.tt | 190 +++++++++++++++++++
.../prog/en/modules/common/patron_search.tt | 9 +
.../prog/en/modules/suggestion/suggestion.tt | 205 +++++++++++++++++----
opac/ilsdi.pl | 8 +
reserve/request.pl | 13 +-
{admin => suggestion}/add_user_search.pl | 15 +-
suggestion/suggestion.pl | 70 +++++--
t/Koha/SearchEngine/Elasticsearch.t | 25 ++-
.../Holds/DisallowHoldIfItemsAvailable.t | 62 ++++++-
t/db_dependent/Koha/Desks.t | 60 ++++++
29 files changed, 1074 insertions(+), 203 deletions(-)
copy t/db_dependent/Koha/Plugins/z_reset.t => Koha/Desk.pm (56%)
copy Koha/{REST/V1/CirculationRules.pm => Desks.pm} (54%)
copy Koha/Schema/Result/{BranchesOverdrive.pm => Desk.pm} (52%)
copy admin/{cities.pl => desks.pl} (56%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
copy {admin => suggestion}/add_user_search.pl (82%)
create mode 100644 t/db_dependent/Koha/Desks.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list