[koha-commits] main Koha release repository branch master updated. v17.05.00-161-g60e55c8
Git repo owner
gitmaster at git.koha-community.org
Wed Jul 5 19:06:22 CEST 2017
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 60e55c857c0e59693eaea138fbcc025f0de23960 (commit)
via 69ddc094345e995aabf0b0be79813c2019419caa (commit)
via adff45cd8de804cf64f73ff3fec2fe0151a9e6b5 (commit)
via 57ebe9aefcfc77dbc79b671eb98e1ee997d07d4a (commit)
via e5929123b9d735d8c4b14c56c134fb9f1c37b3ff (commit)
via bbe22168873220d8db5ba9160df20d24f99cdf55 (commit)
via ca0bde1e7e168982efc8917c5836aeedea183621 (commit)
via a2be532dc244ca2e7073c4dd7693011d6aca679e (commit)
via 091d6c513bcbee224ff06477e79be48cea7fe825 (commit)
via c69e02c4419a2d4a7ca31af6441081cadd4e51b3 (commit)
via 8f54bc6ee4f75cebb0f91a023d1e7959bc3ab503 (commit)
via e14f761754b551096dbc5a1f33bb66cb493f1f27 (commit)
via ad2528a1027dcc8ce55d76d76500040feecac06c (commit)
via a58aca056b004dcc9c751cf29ef4e1e860b6baef (commit)
via 1ef053564fdd8a037e9c276b3f2a2cdf58a2f06d (commit)
via 4fe1724e306e9063243d8bda0f71d9aad091a154 (commit)
via b494837c8d17a29936e2c2bcc067120c26876855 (commit)
via 3d2eddaf3da3e090d00b4e5823f8f70a70c06ea1 (commit)
from 905572910b3af03d86fdbd3e52c72614f41c978b (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 60e55c857c0e59693eaea138fbcc025f0de23960
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jun 26 15:25:19 2017 -0300
Bug 17554: (followup) Shibboleth check should use ->find too
There was a remaining use of C4::Members::GetBorrowersWithEmail in Auth.pm.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 69ddc094345e995aabf0b0be79813c2019419caa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 4 14:43:21 2016 +0000
Bug 17554: Koha::Patrons - Remove GetBorrowersWithEmail
C4::Members::GetBorrowersWithEmail can be easily replaced with
Koha::Patrons->search({ email => $email });
Test plan:
Confirm that you are still able to use PKI authentication
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit adff45cd8de804cf64f73ff3fec2fe0151a9e6b5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jun 30 12:02:00 2017 +0200
Bug 17738: [QA Follow-up] Remove second find of same patron
We can just use the $patron from line 77 here.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 57ebe9aefcfc77dbc79b671eb98e1ee997d07d4a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 17 09:00:33 2017 -0300
Bug 17738: Remove warning about redeclaration of $patron
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit e5929123b9d735d8c4b14c56c134fb9f1c37b3ff
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 7 14:43:43 2016 +0100
Bug 17738: Remove C4::Reserves::GetReservesFromBorrowernumber
At this point, there should not be any occurrences of
GetReservesFromBorrowernumber anymore.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit bbe22168873220d8db5ba9160df20d24f99cdf55
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 7 14:42:48 2016 +0100
Bug 17738: Replace GetReservesFromBorrowernumber with Koha::Patron->get_holds
This patch replace the different calls to GetReservesFromBorrowernumber
with a calls to Koha::Patron->get_holds.
In some places we need to get a restricted set of holds, that's why we
process a search on this holds returned by ->get_holds (on the found
status for instance).
The changes are quite trivial and reading the diff should be enough to
catch bugs.
Test plan:
I would suggest to test this patch with patches from bug 17736 and bug 17737,
to place different kind of holds (biblio and item level, future and
past).
Then do a whole workflow to detect bug, view a record, delete record,
order, place a hold on an item which has been ordered, etc.
The hold's informations should always be the same without or without
these patches.
Tested both patches together, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit ca0bde1e7e168982efc8917c5836aeedea183621
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jun 23 10:43:16 2017 +0200
Bug 17843: [QA Follow-up] Some polishing
Resolve warning from members/summary-print.pl:
"my" variable $itemtype masks earlier declaration in same scope
Test if find returns a Koha object in GetDescription.
Test if find returns a Koha object too in shelves.pl. While testing, I had
a crash on a biblioitem with itemtype NULL (bad record, but these things
tend to happen somehow.)
Can't call method "imageurl" on an undefined value at virtualshelves/shelves.pl line 253.
Same for opac/opac-shelves.pl.
Note: Did not add tests everywhere but generally, I have the impression that
we do not sufficiently test on the results of Koha::Object->find. Mostly we
just assume that it will find a record. Several reports include fixes to
resolve that wrong assumption.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit a2be532dc244ca2e7073c4dd7693011d6aca679e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 4 10:32:26 2017 +0100
Bug 17843: Remove C4::Koha::getitemtypeinfo
At this point there should not be any calls to this subroutine.
Signed-off-by: Lari Taskula <lari.taskula at jns.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 091d6c513bcbee224ff06477e79be48cea7fe825
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 4 10:30:47 2017 +0100
Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes
The C4::Koha::getitemtypeinfo subroutine did the almost same job as
GetItemTypes. On top of that it returned the imageurl value processed by
C4::Koha::getitemtypeimagelocation.
This value is only used from the 2 [opac-]shelves.pl scripts. Then it's
better not retrieve it only when we need it.
Test plan:
Play with the different scripts touched by this patch and focus on item
types. The same description as prior to this patch must be displayed.
Note that sometimes it is not the translated description which is
displayed, but that should be fixed on another bug report. Indeed we do
not expect this patch to change any behaviors.
Signed-off-by: Lari Taskula <lari.taskula at jns.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit c69e02c4419a2d4a7ca31af6441081cadd4e51b3
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 12 12:28:31 2017 +0200
Bug 18782: Remove unused C4::Serials::getsupplierbyserialid
TEST PLAN
----------
git grep -i getsupplierby
-- only the code removed and the test tweaked
git bz apply 18782
sudo koha-shell -c bash kohadev
prove -v t/db_dependent/Serials.t
qa -v 2 c 1
exit
-- sign off
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 8f54bc6ee4f75cebb0f91a023d1e7959bc3ab503
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 3 17:01:02 2017 +0000
Bug 18228: QA Followup - use gender neutral language in new tests
commit e14f761754b551096dbc5a1f33bb66cb493f1f27
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 15 10:44:47 2017 -0300
Bug 18228: Add missing comma in kohastructure.sql
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ad2528a1027dcc8ce55d76d76500040feecac06c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Mar 8 16:28:59 2017 +0100
Bug 18228: Adjust Virtualshelves.t
Test plan:
Run t/db_dependent/Virtualshelves.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Eric Gosselin <eric.gosselin at inlibro.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a58aca056b004dcc9c751cf29ef4e1e860b6baef
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Mar 8 15:31:25 2017 +0100
Bug 18228: Implement the new columns in code
The two new columns as mentioned in the commit message of the table
revision must be used in the codebase now.
Highlighting some changes in Koha::VirtualShel[f|ves]:
[1] Additional methods is_public and is_private.
[2] Method add_biblio did not check permissions. Does now. No impact on the
interface, but one call in the unit test was affected.
[3] Method remove_biblios is signficantly simplified. Removed a FIXME.
[4] Method can_biblios_be_removed now redirects to can_biblios_be_added.
A followup report may deal with unifying those routines.
[5] Condition in get_some_shelves changed.
[6] The reference to allow_add in get_shelves_containing_record can simply
be removed.
opac-shelves.pl and shelves.pl now pass the default setting of Owner only
to the template.
Templates shelves.tt and opac-shelves.tt now include the new permission
field with three choices as mentioned in the table revision patch.
opac-addbybiblionumber.pl and addbybiblionumber now need a check on
allow_change_from_owner; search conditions slightly adjusted to the new
permission scheme.
Test plan:
When we refer to visibility in the test plan, please check the Add to-combo
on opac search results and staff results. And check opac-addbybiblionumber
by clicking Save to Lists from opac results.
The step 'Check delete' means: open the list in opac and check if you see
the Delete button below the entries (only check, do not delete).
[ 1] Create private list I01 (perm=Owner)
[ 2] Check visibility: Seen.
[ 3] Add a book. (Change by owner should be allowed.)
[ 4] Check delete: Yes.
[ 5] Edit list I01, set perm=Nobody
[ 6] Check visibility: Not seen.
[ 7] Check delete: No.
[ 8] Share list I01 with another patron.
[ 9] Check visibility for the other patron: Not seen.
[10] Check delete for the other patron: No.
[11] Change permission of list I01 to Anyone (by owner).
[12] Check visibility for the other patron: Seen.
[13] Let other patron add a book (change is allowed).
[14] Let owner delete the same book again (change allowed).
[15] Create public list U01 (perm=Owner)
[16] Check visibility: Seen.
[17] Add a book. (Change by owner should be allowed.)
[18] Login as other user. Check visibility: Not seen. Check delete: No.
[19] Change permission of U01 to Nobody (by owner)
[20] As owner: Check visibility: Not seen. Check delete: No.
[21] As other user: Check visibility: Not seen. Check delete: No.
[22] Create public list U02 (perm=Anyone)
[23] Add a book by owner.
[24] Delete the same book by other user. Add another book.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1ef053564fdd8a037e9c276b3f2a2cdf58a2f06d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Mar 8 14:19:34 2017 +0100
Bug 18228: DBIx schema changes for Virtualshelve.pm
No test plan.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4fe1724e306e9063243d8bda0f71d9aad091a154
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Mar 8 14:10:32 2017 +0100
Bug 18228: Table revision of virtualshelves
In order to make the permissions easier, we will replace the columns
allow_add, allow_delete_own and allow_delete_other by two new columns
allow_change_from_owner and allow_change_from_others.
The distinction between adding or deleting an entry is no longer made.
If you have change permission, you can do both. Also deleting an entry
does no longer depend on who added the entry.
Formerly, the owner could always add entries. It is now possible to
make a list readonly.
We will not use the combination of owner=no and other=yes. This will
leave us three possibilities:
[1] owner=no, other=no: The list is read-only. No one can change
contents of the list. Naturally, the owner can edit permissions.
[2] owner=yes, other=no: Only the owner can change contents.
[3] owner=yes, other=yes: Anyone seeing the list can change contents.
This especially applies to shared lists and public lists.
The two database columns will be presented in the interface as one
permission field offering the three abovementioned options.
Test plan:
[1] Run the db rev.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b494837c8d17a29936e2c2bcc067120c26876855
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 22 08:55:16 2017 +0200
Bug 18214: Add check for shared or public list
Following the idea behind bug 10865, we are only showing the permissions
when the list is shared or public.
Adding a simple test in opac-shelves here.
Note 1: Since the owner can always add or delete entries, the permissions
will not be relevant anymore for a strictly private list.
Note 2: Staff view always shows the permissions. This could have been
changed here too, but that change is far less urgent (bug 10865 did not
touch staff view and bug 18228 will rearrange permissions anyway).
Test plan:
[1] Verify on OPAC that you see the permissions for a private list with
shares or a public list. And you do not see them for a private list
without shares.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit 3d2eddaf3da3e090d00b4e5823f8f70a70c06ea1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 6 09:44:48 2017 +0100
Bug 18214: Cannot edit list permissions of a private list
If you have disabled the pref OpacAllowPublicListCreation, your users are
not able to edit the list permissions for private/shared lists.
For a private list they may only be theoretically relevant, but for a shared
list they are relevant.
Since we do not always know the history of a list (has it been public or
shared, does it contains entries from other users) and therefore permissions
are even relevant for a currently private list, we should just allow editing
these permissions.
Test plan:
[1] Do not yet apply this patch.
[2] Disable OpacAllowPublicListCreation.
[3] Create a private list in OPAC. Edit the list. Verify that you do not
see the permission combo boxes.
[4] Apply this patch. Edit the list again. Do they appear now?
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Works as advertised.
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 16 ++--
C4/Biblio.pm | 4 +-
C4/ILSDI/Services.pm | 30 ++++---
C4/Koha.pm | 40 ----------
C4/Members.pm | 36 ++-------
C4/Reserves.pm | 35 ---------
C4/SIP/ILS/Patron.pm | 20 +++--
C4/Serials.pm | 29 +------
Koha/Patron/Discharge.pm | 9 ++-
Koha/Schema/Result/Virtualshelve.pm | 20 ++---
Koha/Template/Plugin/ItemTypes.pm | 9 +--
Koha/Virtualshelf.pm | 74 +++++++-----------
Koha/Virtualshelves.pm | 12 +--
acqui/orderreceive.pl | 5 +-
catalogue/getitem-ajax.pl | 5 +-
circ/returns.pl | 12 +--
circ/transferstoreceive.pl | 5 +-
circ/waitingreserves.pl | 5 +-
installer/data/mysql/atomicupdate/bug18228.perl | 30 +++++++
installer/data/mysql/kohastructure.sql | 5 +-
.../prog/en/modules/virtualshelves/shelves.tt | 35 +++------
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 42 ++++------
members/discharge.pl | 6 +-
members/summary-print.pl | 6 +-
opac/opac-addbybiblionumber.pl | 17 ++--
opac/opac-browser.pl | 1 -
opac/opac-reserve.pl | 12 +--
opac/opac-search.pl | 3 +-
opac/opac-shelves.pl | 28 ++++---
opac/opac-tags_subject.pl | 1 -
svc/checkouts | 5 +-
svc/holds | 5 +-
t/db_dependent/Holds.t | 17 ++--
t/db_dependent/Koha.t | 8 +-
t/db_dependent/Serials.t | 4 +-
t/db_dependent/Virtualshelves.t | 82 ++++++++------------
virtualshelves/addbybiblionumber.pl | 17 ++--
virtualshelves/shelves.pl | 26 ++++---
38 files changed, 287 insertions(+), 429 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug18228.perl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list