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, 18.11.x has been updated
via dc4e072039c127d28554d46a3f1cbe6dac921d91 (commit)
via 58e38db49f9d979f7e3b031c5549649c0d8f7481 (commit)
via c9e93eea638092c06dcfbcc27c8985683e0916c1 (commit)
via 1716917fb5f6c6bd5b84fa01e8bedd2a1f0bba1b (commit)
via 7a7fdac0b263baac5d196c83b17e2c7d830b930d (commit)
via 912a97f8b49b89d03ed524bed2072db0a50c4527 (commit)
via dc32211a8ea12e67453e5af9edaac0a73b52e2de (commit)
via df88d3c87a11feb17b7949d2a3567220a07bc196 (commit)
via 7c39ad305da2c337743fc5122c5a7b5220dea98f (commit)
via 8a2e6473d7c974a5a0cdccc49be7086789bc6c0e (commit)
via 8c781986eef08d136939c96f2920d73f54f38888 (commit)
via 625265be742d27fb27e6b501df1e38e65ad1a878 (commit)
via 8a501d6e6368d7e72e349bf9909d62acfff6dd49 (commit)
via 7f81521067d5fcca8ba399a280515ce8942c7284 (commit)
via 7619c90e0670c2f5dd10d3c0c03a8d3b38ff4f85 (commit)
via fd22ef99fe0d78bce28d659323bd8401067f198b (commit)
via 4a2e88549505afbf28c2e0236f81012789262496 (commit)
from 170cdc4b01ce53a4ac114ab4d2d45b14af50627f (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 dc4e072039c127d28554d46a3f1cbe6dac921d91
Author: Nick Clemens <[email protected]>
Date: Tue Apr 2 18:02:14 2019 +0000
Bug 22618: Move tests to t/db_dependent/Acquisition.t
prove -v t/db_dependent/Acquisition.t
Signed-off-by: Michal Denar <[email protected]>
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit ea3cbef473a8b542b58341ef38beb9f7be20f4a1)
Signed-off-by: Martin Renvoize <[email protected]>
commit 58e38db49f9d979f7e3b031c5549649c0d8f7481
Author: Nick Clemens <[email protected]>
Date: Sat Mar 23 08:13:13 2019 +0000
Bug 22641: Use raw filter on html slip
To test:
Enable SCO
Load a patron
Hit finish, print slip
Note slip shows as raw html
Apply patch
Repeat, get a correctly formatted slip
Signed-off-by: Liz Rea <[email protected]>
Signed-off-by: Tomas Cohen Arazi <[email protected]>
https://bugs.koha-community.org/show_bug.cgi?id=22068
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 247d0d1df1ee5cc7f3184d8ac6ab35373af739b3)
Signed-off-by: Martin Renvoize <[email protected]>
commit c9e93eea638092c06dcfbcc27c8985683e0916c1
Author: Nick Clemens <[email protected]>
Date: Mon Dec 24 15:59:22 2018 +0000
Bug 17978: Unit tests for changes
Signed-off-by: Liz Rea <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 313df03ed06f8c4229b38d0306c380214d895c4e)
Signed-off-by: Martin Renvoize <[email protected]>
commit 1716917fb5f6c6bd5b84fa01e8bedd2a1f0bba1b
Author: Nick Clemens <[email protected]>
Date: Mon Dec 24 14:33:51 2018 +0000
Bug 17978: Check if hold can be placed before placing on placerequest.pl
To test:
1 - Set an All/All/All rule with reserves limited 2 to
2 - Search in the staff side
3 - Select all records (or more than 2) from the results
4 - Click 'Place hold'
5 - Find a patron, place holds
6 - You get more holds than you should
7 - Delete those holds
8 - Apply patch
9 - Search and select more than 2 records
10 - Find patron, place holds
11 - Only 2 holds are placed
Signed-off-by: Liz Rea <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit fa53eb4cfa1d0c2125fc3097e6d2328899fc4259)
Signed-off-by: Martin Renvoize <[email protected]>
commit 7a7fdac0b263baac5d196c83b17e2c7d830b930d
Author: Kyle M Hall <[email protected]>
Date: Tue Dec 19 14:20:56 2017 -0500
Bug 17978: Circ rules will not limit holds
The crux of this issue is that all those holds are unfilled record level
holds. The code that checks for the number of holds the user already has
*always* uses a branchcode of some form. Because of this, any open record level
holds are completely ignored for this purpose.
Test Plan:
1) Set ReservesControlBranch to "item's home library"
2) Set an All libraries/All Patrons/All itemtypes rules limiting a patron
to 2 holds
3) Place 3 record level holds, you can but you should not be able to!
4) Delete the holds
5) Apply this patch
6) Attempt to place 3 record level holds
7) Note that you cannot!
Signed-off-by: Josef Moravec <[email protected]>
Signed-off-by: Marcel de Rooy <[email protected]>
Signed-off-by: Liz Rea <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit d7a5925aa0a7a185c8671d8c9989d80bdf2c0939)
Signed-off-by: Martin Renvoize <[email protected]>
commit 912a97f8b49b89d03ed524bed2072db0a50c4527
Author: Tomas Cohen Arazi <[email protected]>
Date: Fri Apr 5 15:13:36 2019 -0300
Bug 22068: (QA follow-up) Return meaningful error codes
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit e98dacf9f1f8464f0db394da6bc1152f96713597)
Signed-off-by: Martin Renvoize <[email protected]>
commit dc32211a8ea12e67453e5af9edaac0a73b52e2de
Author: Jonathan Druart <[email protected]>
Date: Thu Feb 14 17:03:17 2019 -0300
Bug 22068: Prevent patrons to cancel article request they did not create
opac-article-request-cancel.pl doesn't check that the article request to
be cancelled actually belongs to the logged-in borrower. This results in
any logged-in user being able to cancel any article request just by
changing the id in the URL.
Test plan:
- Login with Patron P1, create an article request
- Cancel it
- Create another one
- Copy the cancellation link (must be
/cgi-bin/koha/opac-article-request-cancel.pl?id=X)
- Login with Patron P2
- Hit the cancellation link
=> Without this patch the article request is cancelled
=> With this patch applied there is a 404 redirection
Note that the 404 will also appears when the article request id does not
exist.
Signed-off-by: Ere Maijala <[email protected]>
Signed-off-by: Tomas Cohen Arazi <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 0b931d5de3c4fe9fa2b4823d9b8727b28a46aa7c)
Signed-off-by: Martin Renvoize <[email protected]>
commit df88d3c87a11feb17b7949d2a3567220a07bc196
Author: Hayley Mapley <[email protected]>
Date: Thu Mar 7 20:28:48 2019 +0000
Bug 21003: Made Edit keywords more consistent in add_items-step2.tt
When adding a course reserve with a barcode that already exists, the
title, breadcrumbs, and legend of the form all specify that the user is
editing, and not adding, the book.
Test plan:
Same as comment 1
Signed-off-by: Devinim <[email protected]>
Signed-off-by: Bin Wen <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1)
Signed-off-by: Martin Renvoize <[email protected]>
commit 7c39ad305da2c337743fc5122c5a7b5220dea98f
Author: Hayley Mapley <[email protected]>
Date: Thu Mar 7 02:50:12 2019 +0000
Bug 21003: Removed warning and changed wording on add_items-step2.tt
When editing an item in a Course Reserve, the page displayed is the same
that is displayed when adding an item to a Course Reserve. This patch
removes the warning 'This course already has this item on reserve' when
the item is being edited, as well as changes the title, breadcrumbs, and
header of the div. This patch also Changes the header of the div to say
'Edit 'book_name' in 'course_name'' instead of 'Add 'book_name' to
'course_name'' when adding items to a course reserve if the item is
already present.
To test:
1) Create a new course in Course Reserves (you will need Course
Reserves enabled in syspref)
2) Add an item by clicking the Add reserves button
3) Click the edit button on the right hand side of the item listing
under the Reserves heading
4) Observe that the warning 'The course already has this item on reserve'
appears, and that the title, breadcrumbs and
header of the div all say Add/Reserve
5) Apply the patch
6) Repeat step 3 and observe that the title, breadcrumbs and header of
the div now say Edit
7) Also verify that when adding a reserve with a barcode that does not
yet exist in the course reserves that the warning 'The course already...'
is not displayed and that the header of the div says Add
8) Finally verify that when adding a reserve with a barcode that DOES
exist in the course reserves that the warning 'The course already...' IS
displayed and the header of the div says Edit
9) Sign off!
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 3eee6f3091fcb621152af7f4db6441c98cb74558)
Signed-off-by: Martin Renvoize <[email protected]>
commit 8a2e6473d7c974a5a0cdccc49be7086789bc6c0e
Author: Hayley Mapley <[email protected]>
Date: Thu Mar 14 03:47:59 2019 +0000
Bug 12441: Search.pl conditional checks and displays using same syspref
Script search.pl checks OPACdefaultSortField and OPACdefaultSortOrder, but
shows defaultSortField and defaultSortOrder when using Advanced Search
in the staff client.
Test plan:
Apply the patch and then check that the Advanced Search uses
defaultSortOrder and defaultSortField sysprefs instead of the OPAC
sysprefs in the conditional. Check that sort behaviour in Advanced
Search still functions as expected. (It should do - this doesn't change
what displays, just improves consistency).
Sponsored-by: Catalyst IT
Signed-off-by: Michal Denar <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit c786e4de2369de34ce26610309cbce53534446d3)
Signed-off-by: Martin Renvoize <[email protected]>
commit 8c781986eef08d136939c96f2920d73f54f38888
Author: Owen Leonard <[email protected]>
Date: Thu Mar 7 16:04:25 2019 +0000
Bug 22475: Shelving location doesn't appear on tags list view
This patch corrects the tags list view so that shelving location appears
correctly. Previously the template tried to display a variable which was
empty.
To test, apply the patch and locate an title which has both a tag
applied to it and a shelving location defined for one or more items. Go
to Tools -> Tags and click the tag to view titles with that tag. In the
location column of the table the shelving location should appear along
with library and call number.
Signed-off-by: Liz Rea <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 54cf1df239e3b83ae5550e3ef499038dd5597d95)
Signed-off-by: Martin Renvoize <[email protected]>
commit 625265be742d27fb27e6b501df1e38e65ad1a878
Author: Björn Nylén <[email protected]>
Date: Thu Mar 28 10:28:29 2019 +0100
Bug 10345: Increment copy number when adding multiple copies.
To test:
1. Add multiple copies of an item with data in the 'Copy number' field.
Note that tha data will be identical for all items.
2. Apply patch.
3. Add multiple copies of an item with a positive integer (ie. only digits)
in the 'Copy number' field. Note that the copy number is incremented for each
item.
4. Add multiple copies of an item with some other type of data in the 'Copy
number' field. Note that the copy number field remains unchanged for the added
items.
Signed-off-by: Pierre-Marc Thibault <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 0e0a3173859d4374087e99e1a7cd929c8da61c76)
Signed-off-by: Martin Renvoize <[email protected]>
commit 8a501d6e6368d7e72e349bf9909d62acfff6dd49
Author: Fridolin Somers <[email protected]>
Date: Tue Apr 2 09:57:35 2019 +0200
Bug 22620: OPAC description for CCODE in opac-reserve.tt
Bug 20450 added CCODE to opac-reserve.tt using AuthorisedValues TT plugin.
This patch changes the plugin call so that it requests OPAC description.
Test plan :
1) Define a CCODE with staff and OPAC descriptions
2) Apply this collection on an item
3) At OPAC, place an hold on this item
4) Verify the collection display correctly OPAC description and not staff
description
Signed-off-by: Owen Leonard <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 05e49e6be98723f67ec85a5843fad1fc9787925f)
Signed-off-by: Martin Renvoize <[email protected]>
commit 7f81521067d5fcca8ba399a280515ce8942c7284
Author: Owen Leonard <[email protected]>
Date: Tue Mar 26 14:11:28 2019 +0000
Bug 22575: Item type administration uses invalid error class for dialog
This patch modifies the item types administration script so that it
passes a valid message type to the template, where the type is used as a
CSS class. "Error" is a nonexistent dialog class. It should be "alert."
To test, apply the patch and go to Administration -> Item types.
- Try to delete an item type which is in use. The style of the error
dialog should be correct.
- Try to add an item type using a code which already exists. The error
should look correct.
Signed-off-by: Pierre-Marc Thibault <[email protected]>
Signed-off-by: Bin Wen <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit 40503c8fa86e6c4480ec8ca59e28f0c6f394502d)
Signed-off-by: Martin Renvoize <[email protected]>
commit 7619c90e0670c2f5dd10d3c0c03a8d3b38ff4f85
Author: Nick Clemens <[email protected]>
Date: Sat Mar 23 08:51:15 2019 +0000
Bug 22607: DBRev 18.11.04.001
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit ced69febf3de17691d885e9ee7e03ef46c28b2ae)
Signed-off-by: Martin Renvoize <[email protected]>
commit fd22ef99fe0d78bce28d659323bd8401067f198b
Author: Josef Moravec <[email protected]>
Date: Fri Mar 29 08:13:48 2019 +0000
Bug 22607: Change default value in issues.renewals to '0'.
This patch change renewals column of issues and old_issues tables.
Now it is NOT NULL default 0. It does not make sense when number of
renewals is undefined, it is always integer with value zero or more
Signed-off-by: Martin Renvoize <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit cf95f0a7e6897d3dc4b90c92ffad19230379d7cb)
Signed-off-by: Martin Renvoize <[email protected]>
commit 4a2e88549505afbf28c2e0236f81012789262496
Author: Colin Campbell <[email protected]>
Date: Mon Apr 1 12:16:51 2019 +0100
Bug 22611: Correction for call to get create_item in EDI.pm
There was a typo in the addition of a call to
effective_create_items causing processing to abort after adding
a single copy.
This patch reverts to using the C4::Context call as used for the
first copy created, the intended call to effective_create_items
is a wrapper around that as the field in the basket is guaranteed
to be null (its not set when we call AddBasket). Being consistent
and explicit in what we call should guard against future changes
in dependencies exposing the logic flaw
Added some comments to make logical flow of code clearer
Signed-off-by: Liz Rea <[email protected]>
Signed-off-by: Katrin Fischer <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
(cherry picked from commit f6bc67e851722451a970d085f51fb11fb03e21b3)
Signed-off-by: Martin Renvoize <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 2 +-
Koha.pm | 2 +-
Koha/EDI.pm | 6 +-
admin/itemtypes.pl | 10 +--
catalogue/search.pl | 4 +-
cataloguing/additem.pl | 8 ++
course_reserves/add_items.pl | 2 +
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 14 ++++
.../en/modules/course_reserves/add_items-step2.tt | 12 ++-
.../en/modules/course_reserves/course-details.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tags/list.tt | 5 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../bootstrap/en/modules/sco/printslip.tt | 6 +-
opac/opac-article-request-cancel.pl | 13 +++-
reserve/placerequest.pl | 14 ++--
t/Acquisition.t | 68 -----------------
t/db_dependent/Acquisition.t | 80 +++++++++++++++++++-
t/db_dependent/Holds.t | 18 ++++-
19 files changed, 172 insertions(+), 100 deletions(-)
delete mode 100644 t/Acquisition.t
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
