[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.02-59-g7f724cc
Git repo owner
gitmaster at git.koha-community.org
Thu Feb 22 02:42:25 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, 17.11.x has been updated
via 7f724cc129558da9fd5a558bd0c8b21ebc62174b (commit)
via 8e29e0f106bc625bf9dcd9574f3636d56989939f (commit)
via 490f473a7815854893a0b2a38366c95af345a543 (commit)
via 9a6c8f6c1ebca35161c58b2a57015d1baa60d730 (commit)
via 3fefcead1596467155ec28a77105e4416f454d8b (commit)
via 00fbf1878eb2a767769b1405aec4fff1b13711d0 (commit)
via 615f88273f61adb039c6c38d52e61bfac0db25e8 (commit)
via cbf59b1fa602eb503a4570a13f79f128bcce9a48 (commit)
via 0442865a9e141b00031adde99526e756b9a6c3bf (commit)
via 4b0e6261ac522939183b3dedc50910359bcc477f (commit)
via b3bab56c3168217878e0db921cebef0a97c01303 (commit)
via 52838a0d8211dc5f9686f1b1e358b107981393a9 (commit)
from 6da6f8663b6d3e961a8e6001c8b3569ee7d54b96 (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 7f724cc129558da9fd5a558bd0c8b21ebc62174b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 16 10:25:00 2018 -0300
Bug 19978: Fix ITEMTYPECAT behaviour
ITEMTYPECAT permits to group and hide item types at the OPAC (see bug
10937 for a complete description).
Since commit 091d6c513bcbee224ff06477e79be48cea7fe825
Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes
the code assume that they are item types. Before it just assigned undef
to the description.
Test plan:
Create ITEMTYPECAT authorised values
Assign an item type to this authorised value group
Search for a item using this item type at the OPAC
Without this patch applied you get:
Can't call method "translated_description" on an undefined value at
/home/vagrant/kohaclone/opac/opac-search.pl line 231.
With this patch applied the search result is displayed.
Make sure the original feature still works.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8e29e0f106bc625bf9dcd9574f3636d56989939f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 21 17:15:43 2017 -0300
Bug 18975: Retrieve up-to-date CGISESSID when just logged in
If a user is asked to login before sending a card, the wrong (old)
CGISESSID cookie is used.
We need to retrieve the one that has just been created.
This will certainly need more work, I guess other scripts are affected
too.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 490f473a7815854893a0b2a38366c95af345a543
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 16 12:01:36 2018 +0100
Bug 20227: Check for categorycode in default_borrower_circ_rules
Fixes silent crash when adding the same category twice.
DBD::mysql::st execute failed: Duplicate entry 'ST' for key 'PRIMARY' [for Statement "
INSERT INTO default_borrower_circ_rules
(categorycode, maxissueqty, maxonsiteissueqty, max_holds)
VALUES (?, ?, ?, ?)
" with ParamValues: 0="ST", 1=undef, 2=undef, 3="3"] at /usr/share/koha/devclone/admin/smart-rules.pl line 309.
(Line number affected by bug 15524.)
Very trivial solution.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a6c8f6c1ebca35161c58b2a57015d1baa60d730
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Tue Jan 30 11:22:52 2018 -0500
Bug 19530: Don't update the date arrived for closed transfers
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3fefcead1596467155ec28a77105e4416f454d8b
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Oct 25 21:28:10 2017 -0400
Bug 19530: Added commentary for last test when prove -v
Before patch, prove -v had no comment for the last test.
After patch, it says something in line with second last test.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 00fbf1878eb2a767769b1405aec4fff1b13711d0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 25 14:24:18 2017 -0400
Bug 19530: Prevent multiple transfers from existing for one item
We have found multiple open branch transfers for a given item. While I'm not sure how it is happening at this point, it seems that it would make sense to cancel any existing branch transfers when initiating a new one.
Test Plan:
1) prove t/db_dependent/Circulation/transfers.t
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 615f88273f61adb039c6c38d52e61bfac0db25e8
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Fri Jan 12 09:51:45 2018 +0000
Bug 4319: (QA follow-up) Rename hasItemswaitingOrInTransit to has_items_waiting_or_intransit
and udate pod
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cbf59b1fa602eb503a4570a13f79f128bcce9a48
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 15 10:49:44 2017 +0100
Bug 4319: (QA follow-up) Use ReservableItems in all scripts
[1] Call CountItemsIssued or hasItemswaitingOrInTransit when needed only.
[2] Add this logic to ISBD and MARC detail too, since they also use
this include.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Confirming that Place hold now comes up if you have a waiting item and
circulation rule == If any unavailable.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0442865a9e141b00031adde99526e756b9a6c3bf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 15 10:09:29 2017 +0100
Bug 4319: (QA follow-up) Consistency in IsAvailableForItemLevelRequest
[1] For consistency going back to IsItemOnHoldAndFound in this sub.
This call is used in the on_shelf_holds == 2 case too.
The routine will be refactored quite soon.
Adding the else branch for on_shelf_holds == 0 for more clarity.
[2] Removing the test for found==F in reserves. In Koha F is only used
when the hold is filled and moved to oldreserves.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4b0e6261ac522939183b3dedc50910359bcc477f
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Oct 3 14:50:36 2017 +0000
Bug 4319: [OPAC] Allow holds on waiting/transit items
Test plan:
- Checkout an item
- Place hold on this item,
- Return the item
- Make sure the hold is waiting (found W) and AllowOnShelfHolds is
not to 'Allow'
- Check that the button "Place hold" appears in opac detail page of
the biblio
- do the samewith items/reserves in transit
Changes on C4::Reserves::IsAvailableForItemLevelRequest
Make sure this tests pass:
- t/db_dependent/Reserves.t
- t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
Rebased - 2017-12-12 - Alex Arnaud
Bug 4319 - [QA fix] Create Koha::Biblio->hasItemswaitingOrInTransit
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b3bab56c3168217878e0db921cebef0a97c01303
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 20 13:17:50 2017 -0300
Bug 19671: Map itemtypes to hash for correct display in issues_stats.pl
To test:
1 - Run the circulation wizard with itemtypes as columns, shelving
locations as rows - display on screen
2 - Note all itemtype values are blank
3 - Switch rows/columns - same issue
4 - Apply patch
5 - Re-run reports
6 - Itemtypes should display correctly
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 52838a0d8211dc5f9686f1b1e358b107981393a9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Feb 5 15:30:48 2018 +0000
Bug 20135: Prevent staff client language choose pop-up from appearing off-screen
This patch fixes a bug which was introduced by Bug 19851 ("Improve
responsive layout handling of staff client menu bar."). The changes in
that patch did not take into account the effects it would have on the
language menus in the footer.
This patch adds some additional classes to some menus and adds some CSS
for those classes so that menus are correctly aligned left or right
based on their position on the screen.
To test, apply the patch and clear your cache if necessary. You should
have multiple translations installed and enabled, at least one of which
should have more than one "sub-language" (e.g. en-GB and en-US).
In the staff client, test the appearance of various drop-down menus with
the browser width above and below 800 pixels wide:
- Search and More menus in the header
- User/Library menu in the header
- Language selection in the footer
- Language selection in the header
In all cases, menus should look correct and should not be aligned in
such a way that they disappear off the left or right sides of the
screen.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 2 +
C4/Reserves.pm | 5 ++-
Koha/Biblio.pm | 22 ++++++++++
admin/smart-rules.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 38 ++++++++++-------
.../intranet-tmpl/prog/en/includes/header.inc | 6 +--
.../prog/en/includes/intranet-bottom.inc | 2 +-
.../prog/en/includes/langmenu-staff-top.inc | 4 +-
.../bootstrap/en/includes/opac-detail-sidebar.inc | 2 +-
opac/opac-ISBDdetail.pl | 7 ++--
opac/opac-MARCdetail.pl | 5 ++-
opac/opac-detail.pl | 13 +++---
opac/opac-search.pl | 5 ++-
opac/opac-sendbasket.pl | 3 +-
reports/issues_stats.pl | 10 ++---
t/db_dependent/Circulation/transfers.t | 19 ++++++++-
.../Holds/DisallowHoldIfItemsAvailable.t | 44 +++++++++++++++++++-
t/db_dependent/Koha/Biblios.t | 42 ++++++++++++++++++-
18 files changed, 185 insertions(+), 46 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list