[koha-commits] main Koha release repository branch master updated. v18.05.00-1284-g1a0172a
Git repo owner
gitmaster at git.koha-community.org
Fri Nov 2 11:55:52 CET 2018
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 1a0172a253e5432e5eef862768aaacb3463501f2 (commit)
via 84857caaef467b7c3dfa82404143de8dc41fc858 (commit)
via 9783773ada4dec115342a4f8f16b29eb5b98cc2f (commit)
via e87fa069dc3d10284a2bd31b7c7913132fed5d06 (commit)
via 60ca17c616e6026fbd271fb3f99473f3ef7edf00 (commit)
via 7910a530b85b6ee42307d41cba57b95ced2aca27 (commit)
via 741f17e916a3f64d71b55fd87065136307e3bae7 (commit)
via 7a1641cd41bf51a992cb07dff58d320c49f15b68 (commit)
via 70651422a7517338a68e22321d9918757746ef33 (commit)
via e1b5fa657de843a177fb4bf57947a1376152d021 (commit)
via e31e0e5daa764892dfb7878696cb1159d27c3a1c (commit)
via 8b7a7a2bb34609c402117933625e06e1b8e2cd69 (commit)
via 5e4e10c4ca558180137bf5a4ff5a68495efa0ec7 (commit)
via 12ed04eabb32cb957acd9f88d94ccada0ac09d07 (commit)
via 32c4dbfd6814f01ae2b430e88f13b89bd374f34f (commit)
via ce6a27b0d287f14eb0d515db6b2a5e1f5d278381 (commit)
via f947655862abc813df685d51edbfbe7b34027178 (commit)
via 4ffd2d3b347072f6422adb98608859264ba269d6 (commit)
via 8e8f26f2cb2195f1e07136898320875dc055aad4 (commit)
via 3fb44a8bd63663fb7c4d93e85c30d58d9b2ce08f (commit)
via f4f995a4e690b53504561294655e548a53994a81 (commit)
via 1c8952a36b3b810b7bc290a7eb7cc85cc766ed61 (commit)
via 7085772e8de25fe49b77555e318cc03ab6bcb33b (commit)
via 433fc3f120cfa08fda1dd55a7db721bdf3bf1e9b (commit)
via ca3c2b0b639f571981570d4a342c74a1ca026996 (commit)
via ebf0336059635f2ea13c7f626b794e92e4980f46 (commit)
via 8302a5d6ab287e37b9927efad6401c00c1089869 (commit)
via 4bd78f7443ac108eab35263b89bb610e6675d8c2 (commit)
via 966e6351760d08825b79a5b7c96af167cf8d9267 (commit)
via 9df62cf1caed793f883122eca332c409eddce710 (commit)
from 5ea877f6cba299373e0ebb9c59f8797baba98bec (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 1a0172a253e5432e5eef862768aaacb3463501f2
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 2 10:41:15 2018 +0000
Bug 20968: (RM follow-up) Add missing filter
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 84857caaef467b7c3dfa82404143de8dc41fc858
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Oct 5 15:18:59 2018 +0200
Bug 21501: Remove dead code from course reserves module
search_on parameter is not used in any templates so course-reserves.pl
can be simplified a bit
Test plan:
1. Go to course reserves module and verify that it is still working
2. `git grep search_on` should return nothing
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9783773ada4dec115342a4f8f16b29eb5b98cc2f
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Jun 29 09:23:38 2018 +0100
Bug 20968: (follow-up) Replace tabs with spaces
Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e87fa069dc3d10284a2bd31b7c7913132fed5d06
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Wed Jun 27 13:21:53 2018 -0400
Bug 20968: Rename method get_intranet_catalog_toolbar_button to intranet_catalog_biblio_enhancements_toolbar_button
Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 60ca17c616e6026fbd271fb3f99473f3ef7edf00
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jun 27 17:13:37 2018 +0000
Bug 20968: Add unit tests
Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7910a530b85b6ee42307d41cba57b95ced2aca27
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Jun 27 17:13:27 2018 +0100
Bug 20968: (follow-up) Respond to feedback
This patch:
- Removes the unecessary testing for
intranet_catalog_biblio_enhancements method in detail.pl
- Renames get_toolbar_button to get_intranet_catalog_toolbar_button
Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 741f17e916a3f64d71b55fd87065136307e3bae7
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Jun 20 12:47:10 2018 +0100
Bug 20968: Add hooks into cat-toolbar.inc to display buttons
This commit adds hooks into cat-toolbar.inc to allow the display of
arbitrary buttons as supplied by plugins within the
intranet_catalog_biblio_enhancements class that provide the method
get_toolbar_button
To test:
1) Download the plugin from
https://github.com/PTFS-Europe/cla-permissions-check-plugin
2) Follow the installation instructions from:
https://github.com/PTFS-Europe/cla-permissions-check-plugin
3) TEST: Observe that the "CLA Check Permissions" button takes the user
to the Check Permissions page and a modal displays containing the
results of the query
4) Remove the API key from the plugin "Configuration" page
5) TEST: Ensure that the "CLA Check Permissions" button takes the user
to the Check Permissions page and message displays informing the user
that "Did not receive required request parameters"
https://bugs.koha-community.org/show_bug.cgi?id=20968
Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7a1641cd41bf51a992cb07dff58d320c49f15b68
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 2 10:31:47 2018 +0000
Bug 14385: DBRev 18.06.00.050
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 70651422a7517338a68e22321d9918757746ef33
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 12 07:54:24 2018 +0200
Bug 14385: (QA follow-up) Additional changes and fixes
[1] searchResults: second my $interface can be removed: unused
[2] call of getitemtypeimagelocation on L2119 needs interface key
[3] ISBDdetail: No need to find patron again (line 182 vs 84)
[4] opac-search: No need to find patron twice (657 and 631)
[5] tabs on line 2220 of C4/Search.pm (qa tools warn)
[6] Ugly hack to overcome "Undefined subroutine &C4::Items::ModZebra"
by loading C4::Items before C4::Biblio when running tests
Koha/BiblioUtils/Iterator.t and Labels/t_Label.t.
This is a more general problem that needs attention somewhere else.
It seems that Biblio.pm is one of the suspects.
[7] This patch set makes Search.t crash/fail with me. Note that without
these patches Search.t still passed! Why o why..
A little debugging pointed me to a missing MPL branch (aarg).
Adding the simple test on the result of Libraries->find in
C4::Biblio::GetAuthorisedValueDesc made the test continue.
[8] Resolve: Variable "$borcat" is not available at opac-detail.pl line 246
Lexical $borcat cannot be used in sub searchAgain in opac-detail.pl
under Plack. Must be defined with our (or passed as argument).
[9] Resolve crash on TWO serious typos in opac-basket on ONE line:
Koha::Patron->find({ borrowernumber -> $borrowernumber })
Yeah: find is in Koha::Patrons and we need => !!
No need to pass a hash to find method btw for a pk value.
[10] Serious bugfixing here. Add List::Util to opac-basket.
Can't locate object method "none" via package "1".
You can't test everything :)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
After this longer list I renamed Final to Additional in the patch title :)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e1b5fa657de843a177fb4bf57947a1376152d021
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Mar 5 20:11:52 2018 +0000
Bug 14385: Squash of a lot of patches rebased
- Added missing GetHiddenItems parameter change case
Without this prove t had a failure.
- Always use mocks, not set_preference
- Tweaks so t/db_dependent/00-strict.t passes
There was a typo botcat vs borcat and borrowernumber was never
defined. Grabbing from userenv, like other code does.
- Tweak t/db_dependent/Items.t to fully test changes
This will test all the if structures fully in GetHiddenItemnumbers.
prove t/db_dependent/Items.t
- Tweak borrower category code
$borrower->{categorycode} on a Koha::Patron is not the
same as $borrower->categorycode. Fixed error.
- Search was returning URLS for wrong interface
There was one search context place wrong. Changed it to $is_opac
as the logic for setting $is_opac was modified correctly.
- Corrected issues with category code.
When a user isn't logged in, $borrower is undef and causes error
when determining category code. Added conditional check.
- Properly trigger all changes in C4/Search.pm
- Fix QA Test tool failures
C4/Search.pm had some tabs.
- Add some commenting to make sense of logic
- Refactor EmbedItemsInMarcBiblio parameters to hashref
- Trigger GetMarcBiblio's EmbedItemsInMarcBiblio call.
prove t/db_dependent/Items.t
- Add missing test to trigger Koha/BiblioUtils/Iterator change
- Add borrower category overrides
These files generally add borcat parameter to GetMarcBiblio.
Others might include correction of filtering of items
(opac-basket), or a comment as to why no changes were done
(opac-search).
In the case of opac-search, correcting the first FIXME will
likely correct the OpacHiddenItems issues on tags. As such,
that is beyond this bugs scope.
Some code had loop optimizations and fixes made, like a
'next unless $record' when the biblio shouldn't even be in
the list.
- Modify opac-ISBDdetail and opac-MARCdetail
Both files had similar logic. They were rearranged and
optimized, so that both files would have practically identical
initial blocks of code.
Optimizations were possible, because GetMarcBiblio
returns a filtered record, so that there is no double call
(once in the opac-### file and once in GetMarcBiblio) to
GetHiddenItemnumbers.
- Fix hiding in opac-tags
opac/opac-tags.pl was not properly hiding.
There is currently one known bug associated with tags left.
If you have two biblios tagged by different people with the
same tag, the opac-search will show the one you tagged that
is supposed to be hidden, because tag searches work differently
than regular searches. This is beyond the scope of this bug.
See the FIXME's in opac/opac-search.pl
- Trigger the C4::ILSDI::Services changes
prove t/db_dependent/ILSDI_Services.t
- Added missing 'my'
- Test C4/Labels/Label.pm changes
- Improve C4::Record::marcrecord2csv test cases
- Corrected opac-details searchResult call
- Fix breaking issues constraint in ITerator test
- Fix ILSDI_Services test when clubs with branch exist
- Rebased again!
- Rebased t/db_dependent/Items.t conflict.
The test plan is in comment #112 last I checked.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e31e0e5daa764892dfb7878696cb1159d27c3a1c
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Fri Sep 16 02:42:03 2016 +0000
Bug 14385: (follow-up) Changes to sysprefs.sql and atomicupdate
Run updatedatabase.pl when testing
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8b7a7a2bb34609c402117933625e06e1b8e2cd69
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Jul 19 17:45:43 2016 +0200
Bug 14385: (follow-up) C4::Borrowers not found
GetMember is in C4::Members, not C4::Borrowers
Signed-off-by: Claire Gravely <c.gravely at arts.ac.uk>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5e4e10c4ca558180137bf5a4ff5a68495efa0ec7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Nov 6 10:34:18 2014 +1300
Bug 14385: Extend OpacHiddenItems to allow specifying exempt borrower categories
Edit: Fixing merge conflicts in
- t/db_dependent/Items.t
- t/db_dependent/Search.t
- C4/Search.pm
Changes the API for calling GetHiddenItems and all the places in the code that call it. This is to allow borrower categories to be passed in.
Adds an OpacHiddenItemsExceptions syspref to allow certain borrower categories to be able to see items, even if they are marked hidden by OpacHiddenItems
To test:
1) Make two borrowers, one in a category that should see everything (ie Adult), and another in a category that should only see certain things (ie Adult - exceptions)
2) Add the borrower that can see everything (the Adult) to OpacHiddenItemsExceptions
3) To the OpacHiddenItems syspref, add an item type (ensure that you have some records that fall under this type in your library).
4) Log in as the borrower that should only see certain things (Adult - exception)
5) Do a search, filtered to show records which are the item type that you specified in the OpacHiddenItems syspref. No records should show for this borrower as this item type is hidden to them.
6) Log in as the borrower that should see everything (Adult)
7) Do the same search. There should be results from this search, as this borrower category has been specified as an exception to the hidden items
Signed-off-by: Claire Gravely <c.gravely at arts.ac.uk>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 12ed04eabb32cb957acd9f88d94ccada0ac09d07
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 24 01:17:51 2018 +0000
Bug 21640: Enable output to STDOUT for Itiva outbound script
To test:
1 - Enable the TalkingTechItivaPhoneNotification
2 - Copy 'HOLD' notice 'email' transport to the phone section
3 - Enable EnhancedMessagingPreferences
4 - Find a patron and enable 'phone' for the 'Hold filled' notice
Note: You might not be able to do this straightaway, bug 21639
If the phone box has a '-' and not a checkbox:
sudo koha-mysql kohadev
INSERT INTO message_transports (message_attribute_id,message_transport_type,is_digest,letter_module,letter_code) VALUES (4,'phone',0,'reserves','HOLD');
5 - Place a hold for the patron
6 - Check it in and confirm the hold to set it waiting
7 - sudo koha-shell kohadev
8 - perl misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl --type=RESERVE -w 0 -v
9 - Note the Output says it will be on STDOUT, but nothing is output
10 - Apply patch
11 - repeat
12 - Hold info is output to command line
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 32c4dbfd6814f01ae2b430e88f13b89bd374f34f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 18 19:27:21 2018 -0300
Bug 21606: [sql_modes] Fix matching rules insert
Fix:
Incorrect integer value: '' for column 'offset'
Incorrect integer value: '' for column 'score'
Test plan:
Add/edit matching rules
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ce6a27b0d287f14eb0d515db6b2a5e1f5d278381
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Oct 31 15:26:27 2018 +0000
Bug 20996: (QA follow-up) Fix pod
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f947655862abc813df685d51edbfbe7b34027178
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Oct 31 15:25:17 2018 +0000
Bug 20996: (follow-up) Fix merge problems
Merge conflicts resolved
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4ffd2d3b347072f6422adb98608859264ba269d6
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Sep 28 13:44:16 2018 +0100
Bug 20996: (follow-up) Fix column name expectation
This bug changes how request metadata is obtained. Previously the
appropriate backend's metadata function would return it. For at least
the FreeForm backend, the metadata property names we title cased. The
datatable JS was expecting this and breaks with the new metadata getting
which is performed in the API controller, which just returns the
property names as they appear in the DB.
This patch changes the expectation of the JS to match what's coming back
from the API
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Tested by repeatedly loading the API-call
http://intranet/api/v1/illrequests?embed=metadata,patron,capabilities,library
in Chromium and watching the reported time to load the URL. There
is a siginificant decrease in the time with the patches compared to
the time it takes without the patches. I had some concerns along the
way, but they have all been fixed.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Tested by repeatedly loading the API-call
http://intranet/api/v1/illrequests?embed=metadata,patron,capabilities,library
in Chromium and watching the reported time to load the URL. There
is a siginificant decrease in the time with the patches compared to
the time it takes without the patches. I had some concerns along the
way, but they have all been fixed.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8e8f26f2cb2195f1e07136898320875dc055aad4
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Sep 25 15:19:53 2018 +0100
Bug 20996: (follow-up) Add <branch> to conf tpl
Since we now require the <branch> block, we should add it to the config
templates
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3fb44a8bd63663fb7c4d93e85c30d58d9b2ce08f
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Jul 5 14:46:16 2018 +0100
Bug 20996: Further enhance performance
We were immediately unblessing all request objects after retrieval then,
at a later stage, re-instantiating each one so we could call methods on
that. This was a very bad idea. We now preserve the objects for as long
as we can.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f4f995a4e690b53504561294655e548a53994a81
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Jul 4 13:13:33 2018 +0100
Bug 20996: Fix unit tests
- Remove unit tests relating to TO_JSON
- Add tests for new explicit embedding
- Modify tests relating to now deprecated brw_cat
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1c8952a36b3b810b7bc290a7eb7cc85cc766ed61
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Jul 3 11:36:58 2018 +0100
Bug 20996: Remove prefix use of borrower category
This patch removes the potential use of borrower category as a ILL
request ID prefix. It makes no sense. We provide the ability for a site
to define a request prefix based on branch, there is no use case for
using the borrower category. Add to this that the borrower for every
request was being retrieved in order to get the category, it's a huge
performance hit also.
We also now require the <branch> block in the <interlibrary_loans> block
and complain if it's not present. The request prefix should be defined
in this block.
This patch also improves the performance of the API request that returns all
requests, optionally including additional data.
It also deprecates the overloaded TO_JSON method and moves the request
augmentation code into the API route's controller. It may be that we
want to shift it out of there at some point, but it is fine where it is
for now.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7085772e8de25fe49b77555e318cc03ab6bcb33b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 18 18:10:19 2018 -0300
Bug 21604: Fix add/edit fund/budget
[Strict SQL modes context]
For insert aqbudgetperiods:
Incorrect integer value: '' for column 'budget_period_id'
For insert/update aqbudgets
Incorrect integer value: '' for column 'budget_owner_id'
Incorrect decimal value: '' for column 'budget_encumb'
Test plan:
Add/edit budgets and funds
A good example of why we should use Koha::Object for all our objects
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 433fc3f120cfa08fda1dd55a7db721bdf3bf1e9b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Nov 2 07:44:34 2018 +0100
Bug 21604: Add two trivial test cases
Adding an id in AddBudgetPeriod and an empty string in AddBudget for
budget_encumb.
Test plan:
Run Budgets.t with/without this patch in strict sql mode.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ca3c2b0b639f571981570d4a342c74a1ca026996
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 19 14:37:26 2018 +0100
Bug 21620: Prevent stockrotation cronjob failures
Superflous use of sprintf combined with rebasing issue left the
stockrotation cronjob such that a 'No action taken' email report would
catastrophically fail with the error:
Redundant argument in sprintf at ./stockrotation.pl line 316
This patch both resolves the error and cleans up some additional
unrequired sprintf usage.
Test Plan
1) Create a rotation plan
2) Add some items to the rotation plan
3) Run the cronjob using `stockrotation.pl --report=email --send-email
--execute`
4) Note the lack of errors
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ebf0336059635f2ea13c7f626b794e92e4980f46
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 2 10:01:16 2018 +0000
Bug 21656: DBRev 18.06.00.049
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8302a5d6ab287e37b9927efad6401c00c1089869
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 25 13:34:44 2018 -0300
Bug 21656: Update 4 missing sample_notices.sql
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4bd78f7443ac108eab35263b89bb610e6675d8c2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 25 13:32:17 2018 -0300
Bug 21656: Reduce the risk of possible side-effects
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 966e6351760d08825b79a5b7c96af167cf8d9267
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Oct 25 15:30:10 2018 +0000
Bug 21656: (follow-up) Fix atomicupdate
The atomicupdate is going to run as part of an upgrade.
It needs to UPDATE, not INSERT.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9df62cf1caed793f883122eca332c409eddce710
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 24 11:14:56 2018 +0100
Bug 21656: Fix for bad TT syntax in default stock rotation notice
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 50 +++++--
C4/Budgets.pm | 5 +
C4/Items.pm | 17 ++-
C4/Matcher.pm | 4 +-
C4/Record.pm | 5 +-
C4/Search.pm | 32 ++---
Koha.pm | 2 +-
Koha/BiblioUtils/Iterator.pm | 4 +-
Koha/Exporter/Record.pm | 5 +-
Koha/Illrequest.pm | 51 +------
Koha/Illrequest/Config.pm | 22 ++-
Koha/REST/V1/Illrequests.pm | 108 ++++++++++++--
about.pl | 7 +
catalogue/detail.pl | 64 +++++----
catalogue/search.pl | 2 +-
cataloguing/addbooks.pl | 5 +-
cataloguing/additem.pl | 4 +-
course_reserves/course-reserves.pl | 16 +--
debian/templates/koha-conf-site.xml.in | 7 +
etc/koha-conf.xml | 7 +
ill/ill-requests.pl | 9 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +-
.../data/mysql/en/mandatory/sample_notices.sql | 2 +-
.../data/mysql/es-ES/mandatory/sample_notices.sql | 2 +-
.../mysql/fr-CA/obligatoire/sample_notices.sql | 2 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +-
installer/data/mysql/it-IT/necessari/notices.sql | 2 +-
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +-
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/sysprefs.sql | 1 +
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 19 +++
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 +
.../prog/en/modules/admin/preferences/opac.pref | 3 +
.../en/modules/course_reserves/course-reserves.tt | 21 ---
.../prog/en/modules/ill/ill-requests.tt | 6 +-
.../prog/en/modules/plugins/plugins-home.tt | 3 +
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +
misc/cronjobs/stockrotation.pl | 25 ++--
.../thirdparty/TalkingTech_itiva_outbound.pl | 2 +-
misc/migration_tools/build_oai_sets.pl | 4 +-
opac/opac-ISBDdetail.pl | 60 ++++----
opac/opac-MARCdetail.pl | 74 +++++-----
opac/opac-basket.pl | 30 +++-
opac/opac-detail.pl | 55 +++++---
opac/opac-downloadcart.pl | 13 +-
opac/opac-downloadshelf.pl | 11 +-
opac/opac-export.pl | 16 ++-
opac/opac-search.pl | 15 +-
opac/opac-sendbasket.pl | 5 +-
opac/opac-sendshelf.pl | 15 +-
opac/opac-tags.pl | 46 +++++-
opac/opac-user.pl | 8 +-
t/db_dependent/Budgets.t | 2 +
t/db_dependent/ILSDI_Services.t | 42 +++++-
t/db_dependent/Illrequests.t | 75 +---------
t/db_dependent/Items.t | 59 +++++---
t/db_dependent/Koha/BiblioUtils/Iterator.t | 76 ++++++++++
t/db_dependent/Labels/t_Label.t | 147 ++++++++++++++++++++
t/db_dependent/Plugins.t | 4 +-
t/db_dependent/Record/marcrecord2csv.t | 8 +-
t/db_dependent/Search.t | 50 ++++++-
t/db_dependent/api/v1/illrequests.t | 19 ++-
t/lib/Koha/Plugin/Test.pm | 10 ++
66 files changed, 981 insertions(+), 400 deletions(-)
create mode 100644 t/db_dependent/Koha/BiblioUtils/Iterator.t
create mode 100644 t/db_dependent/Labels/t_Label.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list