[koha-commits] main Koha release repository branch master updated. v19.11.00-152-g642f738
Git repo owner
gitmaster at git.koha-community.org
Fri Jan 3 14:30:21 CET 2020
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 642f7386924bc799f0855ecf7baff6197c1ffaa6 (commit)
via 23bddb729dc2655958b6860c8f2d9f9872754ccf (commit)
via 1072e364bd93419ead69c85222eb21d76a6b9060 (commit)
via b91b53a10388446ace1907d41f1bbc1c2a8352a6 (commit)
via 01cf725b990baf30b3f98406593eaa003b91862c (commit)
via 3b25ea7c94b4b23632e2bb0971dd3cf3e7c4f5c7 (commit)
via da620fdf91278d7a5d9d57ff75a2659565aa995d (commit)
via fb36449fa9b1a43d3233fa58f3eeb09063edbe4b (commit)
via 546a3b6d4d6333fe938572f0247dfcbe4a4d35a8 (commit)
via 28b155ca1e33832f9aebc7aa6937fbe2f0e2f54c (commit)
via f668fecec3771b633068f89dcead2312471f9425 (commit)
via 13322855088ed073acce531742460e57e109ef0e (commit)
via a998ba5714c8dc1b78062e95bd78e2738112737d (commit)
via 8141ebbac6e65f7c76a9ec70ab7329564404b738 (commit)
via 7c731050337afdcc509cdfb39fa31ed537b495ab (commit)
via 59d5ada70e6abe7c9bdbf53450e5e7c11c9d3099 (commit)
from 309754a143cb2f4ce1adc9b4bfeeca3e9af900a0 (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 642f7386924bc799f0855ecf7baff6197c1ffaa6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 3 13:05:39 2020 +0000
Bug 22284: DBRev 19.12.00.003
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 23bddb729dc2655958b6860c8f2d9f9872754ccf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Dec 21 00:14:10 2019 -0300
Bug 22284: (QA follow-up) Make pickup locations be Koha::Library objects
This patch makes the following methods return array references of
Koha::Library objects instead or unblessed objects;
- Koha::Item->pickup_locations
- Koha::Biblio->pickup_locations
- Koha::Libraries->pickup_locations
Bonus:
- The template plugin is adjusted to unbless things to keep behavior
- Tests are moved to the right .t file.
- Tests for the new behavior are added.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1072e364bd93419ead69c85222eb21d76a6b9060
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Wed Dec 18 14:50:31 2019 -0300
Bug 22284: (follow-up) Anotate boolean values in Koha::Schema::Result::LibraryGroup
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b91b53a10388446ace1907d41f1bbc1c2a8352a6
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Jul 3 22:29:42 2019 +0000
Bug 22284: Schema update
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 01cf725b990baf30b3f98406593eaa003b91862c
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Wed May 29 02:06:46 2019 -0300
Bug 22284: (follow-up) Squash multiple follow-ups
* Bug 22284: (follow-up) Use GetReserveControlBranch in Koha::Item->pickup_locations
* Bug 22284: (follow-up) Fix tests
* Bug 22284: (follow-up) Fix typo in request.tt
* Bug 22284: (follow-up) Filter pickup on specific item click
* Bug 22284: (follow-up) Fix typos transfered -> transferred
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3b25ea7c94b4b23632e2bb0971dd3cf3e7c4f5c7
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Mon May 27 23:49:05 2019 -0300
Bug 22284: Add "patron's hold group" as new hold_fulfillment_policy option
This patch adds "patron's hold group" as a new option to Hold pickup library match
To test:
1. Set ReservesControlBranch preference to item.
2. Create a hold group
3. Go to circulation and fines rules
SUCCESS => in 'Hold pickup library match' there is a new option called "patron's hold group"
4. In a library not in hold group set 'Hold policy' to "any" and 'Hold pickup library match' to "patron's hold group"
5. Search for a user in the hold group
6. 'Search to hold' for items of the library of step 4
7. Select an item and 'Place hold for [user]'
SUCCESS => in 'Pickup at' you should see patron's hold group as options
8. In OPAC sign in as the same user of step 5
9. Search for the item in step 7
SUCCESS => in 'Pick up locations' you should see patron's hold group as options
10. Sign off
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit da620fdf91278d7a5d9d57ff75a2659565aa995d
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Tue Apr 23 16:18:59 2019 -0300
Bug 22284: (follow-up) Squash multiple follow-ups
* Bug 22284: (follow-up) Remove commented warn and address test failures
* Bug 22284: (follow-up) fix test count after merge
* Bug 22284: (follow-up) fixes after 15496
* Bug 22284: (follow-up) fixes after 18936
* Bug 22284: (follow-up) Remove HomeOrHolding from reserves
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fb36449fa9b1a43d3233fa58f3eeb09063edbe4b
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Tue Apr 30 08:05:17 2019 -0300
Bug 22284: Filter item's pickup locations in holds_table.inc
This patch filters pickup locations per item in holds_table.inc
To test:
1) Go to Circulation and fines rules and change max holds allowed to > 0, and change 'Hold pickup library match' to homebranch
2) Search for a patron
3) Click on "Search to hold"
4) Search for any bilio
5) Place hold on a specific item
CHECK => Item's pickup location is a select with all libraries
6) Apply this patch
7) Repeat steps 2 to 5
SUCCESS => Item's pickup location is filtered by allowed pickup locations
8) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 546a3b6d4d6333fe938572f0247dfcbe4a4d35a8
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Thu Apr 4 01:10:16 2019 -0300
Bug 22284: New message, new column and filter pickup locations in reserve/request.tt
This patch adds a new message to 'Hold' column in 'Place a hold on a specific item' table.
The message is "Cannot place hold from patrons's library". It appears when patron's homebranch is not in item's hold group, and hold_fulfillment_policy is set to 'holdgroup'.
This patch also adds a new column "Allowed pickup locations" that lists allowed pickup locations per item.
Finally, the select that displays pickup locations is filtered by allowed pickup locations, when multi_hold is not enabled
To test:
1) Apply this patch
2) In library groups add a root group and check it as hold group.
3) Add two libraries to the group
4) In circulation and fines rules, in 'Default checkout, hold and return policy', in Hold policy change the value to 'From local hold group'
5) Search a patron from a different library than step 3, select one and click 'search to hold'
6) Search by location for items in any library of step 3
7) On any item, clic on 'Place hold for ...'
SUCCESS => when the page is loaded, in the 'Place a hold on a specific item', you should see the message "Cannot place hold from patrons's library" in 'Hold' column
=> You should see a new column called "Allowed pickup locations" and the message is "Any library"
8) In circulation and fines rules, in 'Default checkout, hold and return policy', in 'Hold policy' change the value again to 'From any library' and change 'Hold pickup library match' to "Item's hold group"
8) Repeat steps 5 to 7
SUCCESS => when the page is loaded, you should see the "Pickup at" select filtered by libraries in hold group
=> You should see in "Allowed pickup locations" a coma separated list of the libraries in item's hold group
=> If biblio has an item whose control branch is not in a hold group, you should see the control branch name in "Allowed pickup locations"
9) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 28b155ca1e33832f9aebc7aa6937fbe2f0e2f54c
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Mon Apr 29 23:07:28 2019 -0300
Bug 22284: (follow-up) Default to circulation control branch when no hold libraries are found
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f668fecec3771b633068f89dcead2312471f9425
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Apr 12 10:32:48 2019 +0000
Bug 22284: Opac pickup_locations
This patch modifies Koha::Libraries->pickup_location and moves most of the logic to
Koha::Item and Koha::Biblio in preparation for api endpoints in the future.
There where 2 methods added
1) Koha::Item->pickup_locations that given a patron, returns all pickup locations of
this item, considering hold fulfillment rules, and hold allowed rules.
2) Koha::Biblio->pickup_locations that given a patron, returns a distinct list of
libraries returned by each of this biblio items pickup location.
Koha::Libraries->pickup_location analyzes input param and calls Koha::Item->pickup_locations
or Koha::Biblio->pickup_locations as needed.
Also in opac-reserve.tt the way options where obtained to fill the pickup location select
was modified to pass the patron as a parameter.
To test:
1) opac: try to place hold on a item and check that all libraries are shown in the
pickup location select.
2) intranet: in Library groups, add 2 root groups marked as local hold group and
add different libraries to each.
3) opac: login as a user of a library belonging to one hold group, and search try to
place a hold on an item belongin to the other hold group.
4) intranet: in Circulation and fines rules, play with 'Hold policy' and 'Hold pickup
library match' rules.
5) opac: On each modification of the rules reload the page.
SUCCESS => Every time you reload the page, the number of pickup locations showed in
select varies.
6) prove t/db_dependent/Koha/Biblios.t t/db_dependent/Koha/Items.t
SUCCESS => Result: PASS
7) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 13322855088ed073acce531742460e57e109ef0e
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Sun Mar 24 23:00:36 2019 -0300
Bug 22284: New methods in Koha::Library::Groups and Koha::Library
This patch adds new methods in Koha::Library::Groups and Koha::Library.
1) For Koha::Library::Groups adds get_root_ancestor that returns all root
groups for a given search parameters, for example
Koha::Library::Groups->get_root_ancestor( { id => $group_id } )
2) For Koha::Library adds
2.1) get_hold_libraries: returns all libraries (including self) that
belongs to the same holdgroups. If $self belongs to several holdgroups
it will return a distinct list of all libraries belonging to them.
2.2) validate_hold_sibling: Returns 1 if the given parameters matches any of the
libraries that belong to any of the holdgroups this library belongs. For example
$library->validate_hold_sibling( { branchcode => $branchcode } )
To test:
1) apply this patch
2) prove t/db_dependent/Koha/Libraries.t t/db_dependent/LibraryGroups.t
SUCCESS => green letters :-D
3) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a998ba5714c8dc1b78062e95bd78e2738112737d
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Mon Mar 25 00:45:58 2019 -0300
Bug 22284: Control hold groups in C4::Reserves
This patch modifies C4::Reserves to control when hold group options where selected
in smart rules.
In CanItemBeReserved adds 2 new error status messages
1) branchNotInHoldGroup: when a patron's homebranch is not in item's hold group
2) pickupNotInHoldGroup: when a selected pickup location is not in item's hold group
Also CheckReserves is modified when item's priority is defined, to control by hold
group when required.
Finally, IsAvailableForItemLevelRequest was also modified to control by hold group when
required.
To test:
1) Apply this patch
2) prove t/db_dependent/Holds.t
SUCCESS => Result: PASS
3) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8141ebbac6e65f7c76a9ec70ab7329564404b738
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Mon Mar 25 00:43:05 2019 -0300
Bug 22284: New hold group options in smart-rules
This patch adds new options for 'Default checkout, hold and return policy'
and 'Default holds policy by item type', both in 'Hold policy' and 'Hold
pickup library match' columns
To test:
1) Go to 'Circulation and fines rules' in admin
2) Check that there are no options for hold group in 'Hold policy' and 'Hold
pickup library match' columns
3) Apply this patch
SUCCESS => in 'Hold policy' you should see 'From local hold group' option, and in
'Hold pickup library match' you should see "Item's hold group"
4) Select any of those options and save
SUCCESS => options should be selected when page reloads
5) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7c731050337afdcc509cdfb39fa31ed537b495ab
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Sun Mar 24 22:56:06 2019 -0300
Bug 22284: Add new checkbox in Library Groups
This patch adds a new checkbox option 'Is local hold group' when you create a new root group.
To test:
1) In intranet go to Library Groups in admin module
2) Add new root group
3) Check that there is no 'Is local hold group' checkbox
4) Apply this patch
5) Add new root group
SUCCESS => a new 'Is local hold group' checkbox appears
6) Select 'Is local hold group' and save
7) Click edit button for root group
SUCCESS => 'Is local hold group' is checked
8) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 59d5ada70e6abe7c9bdbf53450e5e7c11c9d3099
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Sun Mar 24 22:50:42 2019 -0300
Bug 22284: New ft_local_hold_group column, and 'holgroup' enum option
In order to add groups for holds, this patch provides a new column in
library_groups to identify them. Also provides new enum option for
hold_fulfillment_policy column of default_branch_circ_rules,
default_circ_rules, default_branch_item_rules and branch_item_rules.
To test:
1) check that there is no ft_local_hold_group column in library_groups
and that there are no 'holdgroup' enum option in hold_fulfillment_policy
in default_branch_circ_rules, default_circ_rules, default_branch_item_rules
and branch_item_rules
2) apply this patch
3) perl installer/data/mysql/updatedatabase.pl && dbic
SUCCESS => !(step 1) ;-D
4) Sign off
Sponsored-by: VOKAL
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 38 +-
Koha.pm | 2 +-
Koha/Biblio.pm | 27 ++
Koha/Item.pm | 57 ++-
Koha/Libraries.pm | 33 +-
Koha/Library.pm | 51 ++
Koha/Library/Groups.pm | 17 +
Koha/Schema/Result/LibraryGroup.pm | 19 +-
Koha/Template/Plugin/Branches.pm | 6 +-
admin/library_groups.pl | 4 +
installer/data/mysql/kohastructure.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 12 +
.../intranet-tmpl/prog/en/includes/holds_table.inc | 2 +-
.../prog/en/modules/admin/library_groups.tt | 25 +-
.../prog/en/modules/admin/smart-rules.tt | 54 ++-
.../prog/en/modules/reserve/request.tt | 12 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 +-
reserve/request.pl | 19 +-
t/db_dependent/Holds.t | 490 +++++++++++++++++++-
t/db_dependent/Koha/Biblio.t | 266 ++++++++++-
t/db_dependent/Koha/Biblios.t | 2 +
t/db_dependent/Koha/Item.t | 189 +++++++-
t/db_dependent/Koha/Items.t | 4 +-
t/db_dependent/Koha/Libraries.t | 130 ++++--
t/db_dependent/LibraryGroups.t | 21 +-
25 files changed, 1385 insertions(+), 102 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list