[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-67-gcf09864
Git repo owner
gitmaster at git.koha-community.org
Tue Sep 22 20:06:48 CEST 2015
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, 3.20.x has been updated
via cf098649a80ee9ee5fe7f505828b0eec56bef93d (commit)
via f2663af7d1ead6efd7ccc121492a9f264e08b9fc (commit)
via 047f0a486b8db459b0be20e052b9b3cdbf37a584 (commit)
via 08c7606c36f4383b402480ddab8a01dfa9acdccf (commit)
via 14e3841f5104480842eba9848d9bf662647b2413 (commit)
via b73c432887734ae2bd8de87b0c0d6fec1f6a1d4c (commit)
via fbdce06c4cdbd1b9056c7c4d9e385920e3ccb9a5 (commit)
via 2d4e38a25774e9a96d00ad69a46337f38fd40e0a (commit)
via 4c7bd247ef456190199f941f5a4479e948341d70 (commit)
via b565d3a62a0ae7980ac58f653182e0e6c0ccf914 (commit)
via 847259a2ef062555c3595858421e93a5f4d0e9f3 (commit)
via 1b03fc78a1ac9f84464752c5f35e0ff54ffbbb14 (commit)
from 3d74a820b23b7b912dea969f88a865bc714be50c (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 cf098649a80ee9ee5fe7f505828b0eec56bef93d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 14 10:50:12 2015 +0100
Bug 14298: Add perms for other languages
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f2663af7d1ead6efd7ccc121492a9f264e08b9fc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 16:30:15 2015 +0100
Bug 14298: Add warning to the about page if the sco user does not have correct permissions
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Note: Made a little change, changed He should have, to They should have
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 047f0a486b8db459b0be20e052b9b3cdbf37a584
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 16:10:45 2015 +0100
Bug 14298: Use the new permission in the sco scripts
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Note without this patch, you won't be able to access the SCO side.
So don't panic if you cant use SCO with just the first patch
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 08c7606c36f4383b402480ddab8a01dfa9acdccf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 16:09:35 2015 +0100
Bug 14298: Add the new 'self_checkout' permissions
There is a security issue in the self checkout module.
The user used to check items out must have the circulate =>
circulate_remaining_permissions permissions.
So even if a user does not have a login/password or a barcode he cans
access to the circulation module of the intranet.
Imagine if the sco patron used is a superlibrarian...
This patch set will change the behavior and adds a new permission to
access to the sco module (circulate => self_checkout).
This permission should be the only one defined for this patron.
IMPORTANT NOTE: Hopefully, this only works if both interfaces use the
same domains (but different ports).
Test plan:
0/ Does not apply this patch set
1/ Create a patron with the circulate => circulate_remaining_permissions
and some others. Note his userid/pwd (later 'sco/sco').
Turn on WebBasedSelfCheck and AutoSelfCheckAllowed
Fill the AutoSelfCheckID and AutoSelfCheckPass wich 'sco' and 'sco'
2/ Log you out from the OPAC and the intranet
3/ Go on the sco page
4/ Note that your are automatically logged in
5/ Go on the circulation module on the intranet side
6/ Oops
7/ Apply this patch
8/ Execute the updatedatabase
9/ Note that the sco user only has the new permission circulate =>
self_checkout, others have been removed
10/ Try to reproduce the issue, it should not access anything on the
intranet side
11/ Confirm that there is no regression in the sco module
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Works well no regressions, changes the permissions appropriately.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 14e3841f5104480842eba9848d9bf662647b2413
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Wed Jul 22 01:37:30 2015 +0000
Bug 14585: Fixing up online help on main page
To test:
1) Go to home page of staff client and click the Help
2) Notice: 'you should now 'got to' Koha'
'settings found in 'a'dministration.' (should be capitalized)
'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' (could be worded better)
3) Apply patch, close Help, reload page, reopen Help
4) Notice: 'got to' --> 'go to'
'administration' --> 'Administration'
'Once that user is set you should use that user to log in rather than the root user set up as part of installation.'
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit d810fd1094541ee4c95289df3f18bf765047335b)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit b73c432887734ae2bd8de87b0c0d6fec1f6a1d4c
Author: Genevieve Plantin <genevieve.plantin at inlibro.com>
Date: Tue Sep 8 13:58:10 2015 -0400
Bug 13781: Fix missing heading columns for relative's checkouts table in check out patron page
Theres was two missing heading columns Location and Fines in the Check out section of a Patron
Tested both patches together. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit bcb6e9ea39dce065e8c7ff80b4d1b7b49e1735f4)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit fbdce06c4cdbd1b9056c7c4d9e385920e3ccb9a5
Author: Genevieve Plantin <genevieve.plantin at inlibro.com>
Date: Fri Sep 4 09:15:26 2015 -0400
Bug 13781: Fix relatives's checkouts missing heading columns
There was two missing heading columns (location and fine) and one hidden heading missing column (this hidden column is needing for sorting the table) it was taking the due_date column for the hidden column, so I added them
Both patches tested together. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit e0e3efacca9e4e605f0e1c5612ace38194a2f878)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 2d4e38a25774e9a96d00ad69a46337f38fd40e0a
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Wed Sep 16 11:51:12 2015 -0300
Bug 14245: (QA followup) already global
The original patch correctly unmasks the global variable (by
removing the 'my' on the marc2ris function, but wrongly introduces
a new global variable.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 7349777f14b8d4c11f74da2098568a6966800e5a)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 4c7bd247ef456190199f941f5a4479e948341d70
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu May 21 14:00:05 2015 -0300
Bug 14245: Problems with RIS export in unimarc
Variable $itype is used an all C4/Ris.pm to switch
between marc falvors, but is local and not passed along
as argument.
As a quick solution, is defined as global
To test:
1) On UNIMARC setup, export a record as RIS,
check that author (and other fields) are displayed
incorrectly
2) Apply the patch
3) Export again, improved results
4) Run t/Ris.t
There are other problems in this script, needs maintenance
(e.g. no Modern::Perl friendly)
Signed-off-by: Victor do Rosário <jvr at fct.unl.pt>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit e15621fee2693059cce67882691ad8eae9a5c9b7)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit b565d3a62a0ae7980ac58f653182e0e6c0ccf914
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Aug 25 10:35:28 2015 -0400
Bug 14640: 'Cancel Hold' check box on check-out confirmation does not cancel the hold when item is checked out.
This bug is dealing with the situation where an item is checked out to a
patron that is not the next in line hold-wise for an item. In this case,
Koha will warn the librarian that there are holds on the item and
show the first person in line. Again, I want to stress that this
is the case where the item *is not waiting* for a patron. The
hold for the patron listed will just have a priority of 1.
The only situation where the "Cancel hold" checkbox will function
is when the priority 1 hold is an item level hold. This is due to
the fact that CancelReserve is being passed the trio of
biblionumber, borrowernumber, and itemnumber rather than the
singular reserve_id.
1) place biblio level hold on a book to borrower A.
2) check out an item of the book to borrower B.
3) When confirming checkout, check the 'Cancel hold' check-box, and
click the "Yes, check out" button.
4) Note the hold was not canceled
5) Apply this patch
6) Repeat steps 1 through 3
7) Note the hold was indeed canceled
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit a37b3bb7f76b5ddea7400f5268c592c0cc578a8c)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 847259a2ef062555c3595858421e93a5f4d0e9f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 1 10:52:51 2015 +0100
Bug 14640: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 10820de380695f90fd544b40b52682efcf83a962)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 1b03fc78a1ac9f84464752c5f35e0ff54ffbbb14
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 14 15:02:42 2015 +0100
Bug 10005: Inventory - Add an option to not check in items
The inventory tools automatically check in items, this patch adds it as
an option.
Test plan:
1/ Check an item out, fill a file with its barcode, and use this file in
the inventory tools.
2/ Check the new checkbox and confirm that the item is not checked in
3/ Repeat again and don't check it, the behavior should be the same as before
this patch.
Signed-off-by: Jason Robb <jrobb at sekls.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Added a missing </li>.
Patch works as expected.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit e5f604378a45d62e8b454cd390abb18b34ef53f8)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 6 +----
C4/Ris.pm | 6 ++---
about.pl | 28 ++++++++++++++++++++
...98_add_permissions_circulate_self_checkout.perl | 27 +++++++++++++++++++
.../data/mysql/de-DE/mandatory/userpermissions.sql | 1 +
.../data/mysql/en/mandatory/userpermissions.sql | 1 +
.../data/mysql/es-ES/mandatory/userpermissions.sql | 1 +
.../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 +
.../data/mysql/it-IT/necessari/userpermissions.sql | 1 +
.../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 +
.../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 +
.../ru-RU/mandatory/permissions_and_user_flags.sql | 1 +
.../uk-UA/mandatory/permissions_and_user_flags.sql | 1 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 14 ++++++++--
.../prog/en/modules/circ/circulation.tt | 2 ++
.../intranet-tmpl/prog/en/modules/help/mainpage.tt | 6 ++---
.../prog/en/modules/members/moremember.tt | 3 +++
.../prog/en/modules/tools/inventory.tt | 4 +++
opac/sco/help.pl | 2 +-
opac/sco/sco-main.pl | 3 ++-
opac/sco/sco-patron-image.pl | 2 +-
t/db_dependent/Circulation_issue.t | 26 ++++++++++++------
tools/inventory.pl | 19 +++++++------
23 files changed, 125 insertions(+), 32 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_14298_add_permissions_circulate_self_checkout.perl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list