[koha-commits] main Koha release repository branch master updated. v17.11.00-1265-gfdea02e
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 20 17:56:04 CEST 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 fdea02efce857153bd34aab1a7fe600c765c4ad9 (commit)
via 3c5843b1564cc2f1cab2c6bb8be7556b51730631 (commit)
via 4de8790482ebe80611aa2ad81feb03e23e270aac (commit)
via 3277ca88fd079e4bb17c549f317b3ba24a2f64c4 (commit)
via d68fe07bf806e3676fc637dddf0e63dee41055bb (commit)
via 8291ba410e66a6f9adeeeb7e2cac3d2308cc0a3e (commit)
via beb6bd866779a93373ae493c784afbcbd470e4a0 (commit)
via 5d7db25b00fd1191374650c5fe5a6da6d02fcb0c (commit)
via d32791b5db11c20e7e445d0c9e10e8663883598f (commit)
via 8d8dc552418dc0a95c8baadcfc524382e76d971c (commit)
via 6fc6715350084bbba2bef92b52aabf58afd70a9f (commit)
via fbd233db5a4c7201c4691198fe5f0aecb320f357 (commit)
from 439844afaaed1e7507119e34c10ace50d31adfdf (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 fdea02efce857153bd34aab1a7fe600c765c4ad9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 25 21:12:30 2016 -0500
Bug 15922: Show authorized value description in staff client search results for lost, withdrawn, and damaged
If an item in the staff client search results list is lost, withdrawn,
or damaged, the actual authorized value description for each of those
statuses should be displayed rather than the generic term. This patch
adds use of the AuthorisedValues template plugin to output the correct
description.
To test, apply the patch and perform a catalog search in the staff
client which will return results with various values for lost, damaged,
and withdrawn.
Confirm that the correct lost, damaged, or withdrawn status appears for
each item rather than the generic term.
Followed test plan, statuses appear as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3c5843b1564cc2f1cab2c6bb8be7556b51730631
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 15 12:32:43 2017 +0000
Bug 18799: XSLTresultsdisplay hides the icons
If item-level_itypes is turned off and XSLTResultsDisplay is turned on,
biblio-level itemtype images are not shown in staff client search
results. This patch corrects the problem.
This patch also adds some markup and CSS to the itemtype image to make
it look a litte cleaner and work better in result sets in which some
titles have images and some don't.
To test, apply the patch and view the staff client search results page
with various settings:
- XSLT turned on and off
- item-level_itypes turned on and off
- noItemTypeImages turned on and off
Confirm that item type images are shown or not shown correctly according
to each setting.
The difference between this patch and the other patch currently on this
bug is that this patch continues the practice of hiding biblio-level
itemtype information when item-level_itypes is ON.
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4de8790482ebe80611aa2ad81feb03e23e270aac
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Apr 18 10:25:19 2018 +0000
Bug 20603: Remove ModNote, getcredits and getrefunds from C4::Accounts
Test plan:
0) Do not apply the patch
1) Run these 3 commands
git grep ModNote
git grep getcredits
git grep getrefunds
all should return occurances only in C4/Accounts.pm - the sub definition
and in t/db_dependent/Accounts.t
2) Apply the patch
3) Run commands from 1) again, now there should be no occurence
4) prove t/db_dependent/Accounts.t
should return green
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 3277ca88fd079e4bb17c549f317b3ba24a2f64c4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 28 14:49:18 2018 -0300
Bug 20489: Remove warnings from the interface
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 d68fe07bf806e3676fc637dddf0e63dee41055bb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 28 14:44:21 2018 -0300
Bug 20489: Prevent DB user login
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
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 8291ba410e66a6f9adeeeb7e2cac3d2308cc0a3e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 16 12:31:22 2018 -0300
Bug 20580: Make create_superlibrarian.pl accept parameters
So far this script does not accept parameters and create a koha/koha
superlibrarian
This patch makes it accept parameters to create a customized
superlibrarian patrons.
Test plan:
Use the script with valid and invalid paramters and confirm that it
works as expected.
Note: A cryptic "Invalid parameter passed" error is raised when the
categorycode is not valid. Better error handling must be provided but
Koha::Exceptions seems to be enhancement (see related bug reports).
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 beb6bd866779a93373ae493c784afbcbd470e4a0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 16 17:41:42 2018 -0300
Bug 19030: Preserve link between order and subscription when editing an order
The aqorders.subscriptionid info is not sent to the template when the
order is edited. Which means we lose this link.
Test plan:
Create an order from a subscription
Edit the order
=> Without this patch, the aqorders.subscriptionid value is set to NULL
and items are created when receiving serial.
=> With this patch applied the link is preserved and expected behaviors
are preserved during all the acquisition workflow
You should also try and create several orders from the same subscription
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5d7db25b00fd1191374650c5fe5a6da6d02fcb0c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 20 08:21:33 2018 +0200
Bug 19974: (QA follow-up) Do not use bar separator in atomic update
The multiple select saves the selected values with a comma.
Furthermore, preferences.pl also splits on a comma. In other words, the
upgrade will not work with the bar character. All options will be
deselected.
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 d32791b5db11c20e7e445d0c9e10e8663883598f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 2 13:55:16 2018 -0300
Bug 19974: Make MarkLostItemsAsReturned multiple
Given the confusion regarding this behaviour it sounds better to make it
configurable.
This pref will take 4 different values, 1 per place an item can be
marked as lost.
Test plan:
Mark items as lost and confirm the item is returned or not, depending on
the value of the system preference.
- from the longoverdue cronjob (--mark-returned takes precedence if set)
- from the batch item modification tool
- when cataloguing an item
- from the items tab of the catalog module
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
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 8d8dc552418dc0a95c8baadcfc524382e76d971c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 23 09:34:46 2018 +0100
Bug 19974: (QA follow-up) Move lost logic to else branch
If an error is raised for the barcode, we should not try to perform the
lost logic succeeding it.
Futhermore there is no need to go to GetMarcFromKohaField etc. if we just
use the output of ModItemFromMarc.
Note: It seems unnecessary to clear $itemnumber, but I can understand
the anxiety about passing it to the template with op=additem. So just
leaving it here.
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 6fc6715350084bbba2bef92b52aabf58afd70a9f
Author: charles <charles at inlibro.com>
Date: Mon Jan 15 16:20:10 2018 -0500
Bug 19974: Marking an item as 'lost' in additem.pl will not modify the current item
TEST PLAN:
1) Log in with your superlibrarian account
2) Borrow any book
3) Visit your Checkouts page, and click 'Show Checkouts'
4) Click on the item's barcode to visit the item's page
5) On the item's page, click the 'Edit' button, and choose 'Edit items'
6) In the items table, click the 'Actions->Edit' button of the item you borrowed
7) Mark that item as lost (it should be the first row of the form) and click the button 'Save changes'
8) Visit your Checkouts page. The item should still be there, despite BZ12363 claiming it should've been automagically returned
8.1) Your koha-log should also output a warning message: 'DBIx::Class::Storage::DBI::select_single(): Query returned more than one row...'
8.2) If you visit the item's page, the modification had no effect. It should not be marked as lost.
9) APPLY PATCH
10) Start back from step 2), but this time, after marking the item as lost, the item's page should
reflect the change, and the item you borrowed should've been automatically returned to the library
Signed-off-by: Jean-Manuel Broust <jean-manuel.broust at univ-lyon2.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: Using $item->{itemnumber} instead of new variable.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fbd233db5a4c7201c4691198fe5f0aecb320f357
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Apr 10 16:50:56 2018 +0100
Bug 20556: Marking ILL request as complete..
When marking a request as complete, the status is updated internally
then the user to redirected to the view of the request.
Although the redirect header is sent, there is no exit to indicate that
the program flow should stop. As a result, an attempt is made to render
the template, which fails.
This patch simply adds the missing exit.
TEST PLAN
---------
- Create an ILL request
- "Manage request" > "Confirm request"
- "Mark completed"
- TEST: Ensure that no error is written to the error log upon clicking
"Mark completed"
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 51 -------------
C4/Auth.pm | 47 +-----------
C4/Circulation.pm | 15 +++-
acqui/neworderempty.pl | 13 ++--
catalogue/updateitem.pl | 2 +-
cataloguing/additem.pl | 18 ++---
ill/ill-requests.pl | 1 +
installer/data/mysql/atomicupdate/bug_19974.perl | 26 +++++++
installer/data/mysql/sysprefs.sql | 2 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 14 ++++
.../prog/en/modules/acqui/newordersubscription.tt | 2 +-
.../en/modules/admin/preferences/circulation.pref | 11 +--
.../prog/en/modules/catalogue/results.tt | 32 ++++-----
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 7 --
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 11 ---
mainpage.pl | 7 --
members/member-flags.pl | 7 +-
members/memberentry.pl | 6 +-
members/moremember.pl | 8 +--
misc/cronjobs/longoverdue.pl | 2 +-
misc/devel/create_superlibrarian.pl | 75 ++++++++++----------
opac/opac-user.pl | 4 --
t/db_dependent/Accounts.t | 3 -
t/db_dependent/Auth.t | 2 +-
t/db_dependent/Circulation.t | 9 ++-
tools/batchMod.pl | 2 +-
26 files changed, 150 insertions(+), 227 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_19974.perl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list