[koha-commits] main Koha release repository branch master updated. v3.20.00-765-g18cbfd3
Git repo owner
gitmaster at git.koha-community.org
Tue Oct 13 17:14:58 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, master has been updated
via 18cbfd35669ea9226be726da7a201fbcefa79fba (commit)
via 7482d80068434afb0e38ac0905230aa66956843f (commit)
via 388f69e5c9f1ca0e7eab38f26afd93821d4287ac (commit)
via f94afd5e6c5bbc6669cf74177aad0da9f492a3d1 (commit)
via 8b7e1f45832e3b8d079612d973916310766aa93a (commit)
via 9043a27b03d10ad1408ead06c1af42c07a4c4610 (commit)
via 3e77acc24d0cde1c353a1f86d37db77db899c08b (commit)
via 163c23b65c5ecfff3bea6a698c13c25fd65a6d15 (commit)
via 5c0ea130ea2ee9e4503c78c044d58e9fc9aa1d48 (commit)
via 8bcbf137be37611b7a1369b6bbf7adab2e7c9929 (commit)
via f1a1eb05dfb69e38df304fb3401a3ffe9c2cdea6 (commit)
via eda4070f2bc1eec495f0790c1fd3914ef0d30410 (commit)
via c91b0d49a6375a2a7a3576d118700f4752ba03fb (commit)
via 4d8489efba040fab38f2b185a363435c424cca07 (commit)
from e8055c7ef6ef9458026d37cb96556b9e7bb11f85 (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 18cbfd35669ea9226be726da7a201fbcefa79fba
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 13 12:10:58 2015 -0300
Bug 10020: (RM followup) DBIx update / delete leftover file
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7482d80068434afb0e38ac0905230aa66956843f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 13 11:46:18 2015 +0100
Bug 14920: Simplify the date management on reserveratios
Note that the previous patch was wrong, the start date defaulted to yesterday,
the original behavior is to default to last year.
This patch removes some unecessary variable declarations and tests.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 388f69e5c9f1ca0e7eab38f26afd93821d4287ac
Author: Marc Véron <veron at veron.ch>
Date: Tue Sep 29 14:22:33 2015 +0200
Bug 14920: Remove C4::Dates from circ/reserveratios.pl
This patch removes C4::Dates from circ/reserveratios.pl
To test:
- Make sure you have many holds for biblios with not so much items (e.g. 5 holds, 1 item)
or follow hint below
- Go to Home > Circulation > Hold ratios
- Verify that everything works the same without an dwith patch
Hint: To get a big table you can set 'Hod ratio' in the filter to 0.1 (default value is 3).
This was will trigger biblios with less holds than items.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Tested with dateformat syspref, datepiker Ok
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f94afd5e6c5bbc6669cf74177aad0da9f492a3d1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 08:40:19 2015 +0100
Bug 14841: Fine column is not manage by columns settings
Bug 9481 added the "Fine" columns to the checkouts table and bug 13492
added the columns settings to these table.
They overlapped each others in the bugs queue.
Test plan:
Confirm that you are able to hide/show the "Fine" columns on both
checkouts table.
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8b7e1f45832e3b8d079612d973916310766aa93a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 08:34:28 2015 +0100
Bug 14841: Columns settings are not taken into account for checkout table / moremember
There is a typo member vs members in the template when retrieving the
existing settings.
So that all columns are displayed, even the ones which are hidden
(sort_order, due_date_unformatted, etc.)
Test plan:
0/ Does not apply this patch
1/ Go on the columns config page and check some fields not to display by
default for Patrons > moremember > issues-table
2/ Go on the patron detail page (with checkouts), click on the "show/hide
columns" button (top right of the table).
Confirm that the config is not taken into account and that it's ugly
(hidden columns are displayed)
3/ Apply this patch
4/ Everything should be fine now :)
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9043a27b03d10ad1408ead06c1af42c07a4c4610
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Aug 25 12:17:17 2015 -0300
Bug 14727: koha-indexer tab completion in bash
This patch introduces tab-completion in bash to the koha-indexer
command. It completes using valid option switches and instance names.
It stops completing then -h or --help are issued, and once a command
switch is chosen (either --start, --stop or --restart) it goes ahead
with valid instances completion.
To test:
- Have a packages install (kohadevbox works)
- Run:
$ . debian/koha-common.bash-completion
- Type
koha-indexer <tab>
- Play with all the options
=> SUCCESS: They work as they should.
- Sign off :-D
Note: it fixes a small glitch on the plack completion.
Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
Verified working, including filtering out already used options and
instances.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3e77acc24d0cde1c353a1f86d37db77db899c08b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 13 11:27:32 2015 -0300
Bug 14045: DBRev 3.21.00.035
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 163c23b65c5ecfff3bea6a698c13c25fd65a6d15
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 6 18:22:36 2015 +0100
Bug 14045: Fix typo in template
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 5c0ea130ea2ee9e4503c78c044d58e9fc9aa1d48
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 13 17:53:19 2015 +0200
Bug 14045: DBIC Changes
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8bcbf137be37611b7a1369b6bbf7adab2e7c9929
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 13 16:51:49 2015 +0200
Bug 14045: DB Changes
This patch is the DB changes for the feature.
It adds 5 new columns named 'maxonsiteissueqty' to the following tables:
- branch_borrower_circ_rules
- default_borrower_circ_rules
- default_branch_circ_rules
- default_circ_rules
- issuingrules
It also adds the pref ConsiderOnSiteCheckoutsAsNormalCheckouts.
See main patch for more details.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f1a1eb05dfb69e38df304fb3401a3ffe9c2cdea6
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 13 17:08:03 2015 +0200
Bug 14045: Make GetBranchBorrowerCircRule return maxonsiteissueqty
GetBranchBorrowerCircRule should return the value for maxissueqty and
maxonsiteissueqty. It's what this patch does.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit eda4070f2bc1eec495f0790c1fd3914ef0d30410
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 13 17:07:28 2015 +0200
Bug 14045: Introduce the maxonsiteissueqty field as a copy of maxissueqty
This patch adds the new fields maxonsiteissueqty as a copy of the
existing maxissueqty field.
There is no brainy code here, it only adds the ability to fill the new
field from the admin interface (admin/smart-rules.pl).
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c91b0d49a6375a2a7a3576d118700f4752ba03fb
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 13 14:04:50 2015 +0200
Bug 14045: Change prototype of TooMany to raise a better warning
With this patch, the user will know why the checkout is refused.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4d8489efba040fab38f2b185a363435c424cca07
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed May 13 16:56:03 2015 +0200
Bug 14045: Add specific quotas to on-site checkouts
This patch set adds the ability to defined independent quotas for on-site
checkouts.
This will be done using the circulation rules matrix where a new column
“Current on-site checkouts allow” will be added.
This feature is going to use the same method as the existing fields maxissueqty
("Current checkouts allowed"), the new fields will be added to the
different tables (see the "DB changes" patch) and will be named
maxonsiteissueqty (for consistency).
In order to keep the existing behavior and to let more flexibility,
a new system preference is added (ConsiderOnSiteCheckoutsAsNormalCheckouts).
This syspref will let the liberty to the library to decide if an on-site
checkout should be considered as a "normal" checkout or not.
To keep the existing behavior, the syspref will be disabled (i.e. an on-site
checkout is considered as a normal checkout) and the number of on-site
checkouts will be the same as the number of checkout (maxissueqty ==
maxonsiteissueqty).
Technically:
There are only very few tests for the Circulation module, and the 2
subroutines impacted by this patch set were not tested at all.
It is necessary to introduce non-regression tests for this area.
The 2 subroutines are: C4::Circulation::GetBranchBorrowerCircRule
and C4::Circulation::TooMany (only called by
C4::Circulation::CanBookBeIssued, so we will take the liberty to change
the prototype to raise a better warning to the end user).
Test plan:
I. Confirm there is no regression and the existing behavior is kept
0/ Let the syspref disabled
1/ Set a rule to limit to 2 the number of checkouts allowed
2/ Do a normal checkout
3/ Do an on-site checkout
4/ Try to checkout (on-site or normal) an item again.
You should not be allowed.
II. Test the new feature - pref disabled
0/ Let the syspref disabled
1/ Set a rule to limit to 2 the number of checkouts allowed and to 1
the number of on-site checkouts allowed.
2/ Do an on-site checkout
3/ Try to do another one, you should not be allowed to do it.
4/ A normal checkout should pass successfully
Note that it does not make sense to have the number of on-site checkouts
alowed > number of checkouts allowed.
III. Test the new feature - pref enabled
0/ Enable the syspref
Now an on-site checkout is *not* counted as a normal checkout.
This means you can have the number of on-site checkouts > number of
checkouts allowed.
1/ Set the values you want for the 2 types of checkouts (normal vs
on-site).
2/ Even if a patron has reached the maximum of checkouts allowed, he
will be allowed to do a on-site checkout (vice versa).
IV. Stress the developper
Using the different configurations available in the circulation matrix,
try to find one where the checkout is allowed and not should be.
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 191 ++++++----
Koha.pm | 2 +-
Koha/Schema/Result/BranchBorrowerCircRule.pm | 11 +-
Koha/Schema/Result/DefaultBorrowerCircRule.pm | 11 +-
Koha/Schema/Result/DefaultBranchCircRule.pm | 11 +-
Koha/Schema/Result/DefaultCircRule.pm | 11 +-
Koha/Schema/Result/Ethnicity.pm | 66 ----
Koha/Schema/Result/Issuingrule.pm | 11 +-
admin/columns_settings.yml | 4 +
admin/smart-rules.pl | 118 +++---
circ/circulation.pl | 2 +-
circ/reserveratios.pl | 44 +--
debian/koha-common.bash-completion | 40 +-
installer/data/mysql/kohastructure.sql | 5 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 41 ++
.../en/modules/admin/preferences/circulation.pref | 9 +
.../prog/en/modules/admin/smart-rules.tt | 25 +-
.../prog/en/modules/circ/circulation.tt | 6 +-
.../prog/en/modules/circ/reserveratios.tt | 9 +-
.../prog/en/modules/members/moremember.tt | 2 +-
t/db_dependent/Circulation/TooMany.t | 395 ++++++++++++++++++++
t/db_dependent/Circulation_Branch.t | 56 ++-
t/db_dependent/Circulation_Issuingrule.t | 9 +-
24 files changed, 831 insertions(+), 249 deletions(-)
delete mode 100644 Koha/Schema/Result/Ethnicity.pm
create mode 100644 t/db_dependent/Circulation/TooMany.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list