[koha-commits] main Koha release repository branch master updated. v16.05.00-694-g9b8b181
Git repo owner
gitmaster at git.koha-community.org
Thu Sep 8 16:28:39 CEST 2016
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 9b8b18151d7773fe811742cdbf7998a15b70bf27 (commit)
via a3a2dbb8cda01f9dc6fb3f3ed015998794869719 (commit)
via 82c98ad23495f18af7cba32a3d02d1dd34cdda01 (commit)
via 8a6e7b4a768fc78997bc533c380bfb4bba57cbf3 (commit)
via 703bebe92368a23cc30a067cff1b5b7ae9e63b6e (commit)
via cae4b980607be083e5e0fb163c4949c73d6347db (commit)
via 6239bbd35f31bac5b9c98ab96bad9617c68b5de3 (commit)
via a5a23bcebcb0cfce65b72f9ccef484e9d44fe33a (commit)
via 6ee8dd3a597d08ccc5122473e55790d3f21d5163 (commit)
via 3bb1578354e75ae160830a410340c6fbb9faaf3a (commit)
from 7523ef878d432fccf905d68fa5e10fcd8ef30dcb (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 9b8b18151d7773fe811742cdbf7998a15b70bf27
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 12 12:56:22 2016 +0100
Bug 15407: Uniformise calls in patron-attr-types
Does not make sense to call first in list context and later in scalar
context.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit a3a2dbb8cda01f9dc6fb3f3ed015998794869719
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 12 13:26:46 2016 +0200
Bug 15407: [QA Follow-up] Confusing cathash removed
One of the patches removed %cathash. Some kind of silly remainder
was left in a string. Just used as a text field to explain the
filters used on borrowers_stats.pl. The filter name cathash is not
really easy and also was confusing in relation to the variable.
So just a string patch, replacing it with Patron category.
NOTE: The output of borrowers_stats.pl with the filters listed, is
not one of the most beautiful Koha screens.
Furthermore, translatibility of these filters is still an issue to
be handled on another report.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 82c98ad23495f18af7cba32a3d02d1dd34cdda01
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 12 11:05:46 2016 +0100
Bug 15407: (follow-up) Koha::Patron::Categories - replace C4::Category->al
Categories.GetName should not have been removed in the previous patch
(merge conflict issue).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8a6e7b4a768fc78997bc533c380bfb4bba57cbf3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 12 11:20:11 2016 +0200
Bug 15407: [QA Follow-up] Joubu, add your tests
Trivial fix (yes again).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 703bebe92368a23cc30a067cff1b5b7ae9e63b6e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 12 10:49:32 2016 +0200
Bug 15407: [QA Follow-up] Fix POD in reserves_stats.pl
Trivial fix.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit cae4b980607be083e5e0fb163c4949c73d6347db
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 22 10:12:48 2015 +0000
Bug 15407: Koha::Patron::Categories - replace GetborCatFromCatType
This unnecessary complicated subroutine returned an arrayref and an
hashref of the patron categories available for the logged in user, for a given
category_type, ordered by categorycode.
This can now be done with the search_limited method.
Test plan:
- Same prerequisite as before
For the following pages, you should not see patron categories limited to other
libraries. They should be ordered as before this patch, by categorycode.
- Add/edit a patron, change his/her patron category value.
- On the 3 following reports:
reports/bor_issues_top.pl
reports/borrowers_out.pl
reports/cat_issues_top.pl
The display for these 3 reports are different than the 2 from the first
patch (borrowers_stats.pl issues_avg_stats.pl): they are ordered by
categorycode and the ones limited to other libraries are not displayed
(should certainly be fixed).
Note that the big part of this patch has already been tested before
(update child related: CATCODE_MULTI).
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6239bbd35f31bac5b9c98ab96bad9617c68b5de3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 21 17:27:08 2015 +0000
Bug 15407: Koha::Patron::Categories - replace GetBorrowercategoryList
C4::Members::GetBorrowercategoryList returned all the patron categories,
ordered by description.
This can be done using the search method of the Koha::Patron::Categories
module.
Test plan:
- Same prerequisite as before
For the following pages, you should not see patron categories limited to other
libraries. They should be ordered as before this patch, by description.
- On the "patron attribute types" admin page (admin/patron-attr-types.pl).
- On the "Batch patron deletion/anonymization"
(tools/cleanborrowers.pl), the dropdown list should be filled
correctly.
- On the import patron tool
- On the following report:
reports/reserves_stats.pl
Confirm that the patron categories are displayed and that the report
still works as before.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit a5a23bcebcb0cfce65b72f9ccef484e9d44fe33a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 21 17:13:12 2015 +0000
Bug 15407: Koha::Patron::Categories - replace GetBorrowercategory
The purpose of C4::Members::GetBorrowercategory was to return the patron
category for a given categorycode. This can be done easily with the
Koha::Patron::Categories->find method.
Test plan:
- Same prerequisite as before
- Edit a guarantor and confirm the information will be updated for his/her
guarantee(s).
- Update a child to adult patron (Note: Should not we hide the patron
categories limited to others libraries? If yes, it must be done on another
bug report).
There is a special behavior if there is only 1 adult category, the
user does not need to select a category. So the same as before with
only 1 adult patron category.
- Import a patron with a category_code which does not exist. You should
be warned.
- Modify some patron using the batch patron modification tool. The
patron category descriptions should correctly be displayed.
Note that the overduerules page has already been tested in a previous
patch.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6ee8dd3a597d08ccc5122473e55790d3f21d5163
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 21 17:04:30 2015 +0000
Bug 15407: Koha::Patron::Categories - replace C4::Category->all
The C4::Category module contained only 1 method to return the patron
categories available for the logged in user.
The new method Koha::Patron::Categories->search_limited does exactly the
same thing (see tests) and must be used in place of it.
Test plan:
- Same prerequisite as before
For the following pages, you should not see patron categories limited to
other libraries.
- On the 'Item circulation alerts' admin page
(admin/item_circulation_alerts.pl), modify the settings for check-in
and checkout (NOTE: Should not we display all patron categories on
this page? If yes, it must be done in another bug report to ease
backporting it).
- Search for patrons in the admin (budget) and acquisition (order) module.
- On the patron home page (search form in the header)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 3bb1578354e75ae160830a410340c6fbb9faaf3a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 21 15:04:45 2015 +0000
Bug 15407: Koha::Patron::Categories - remove sql queries in some pl and pm
This patch replaces sql queries done in some pl script and in
C4::Reports::Guided.
Since we have now a Koha::Patron::Categories module, we should use it
where it is possible.
Test plan:
- Prerequisite: Be sure you have several patron categories created, with
different option enabled, and limit some to certain libraries.
- On the 'Circulation and fine rules' admin page (admin/smart-rules.pl),
all the patron categories should be displayed (even the ones limited to
another library), ordered by description. Try to add/update existing rules.
- On the overdue rules page (tools/overduerules.pl), all the patron
categories with overduenoticerequired set should be displayed.
Try to add/update existing rules.
- On the following reports:
reports/borrowers_stats.pl
reports/issues_avg_stats.pl
The patron categories should be displayed. Note that there is an
inconsistency with these 2 reports: the patron categories limited to
other libraries are displayed on them, when they are not on the other
reports. This should certainly be fixed (on another bug report).
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Category.pm | 181 --------------------
C4/ItemCirculationAlertPreference.pm | 4 +-
C4/Members.pm | 111 ------------
C4/Reports/Guided.pm | 3 +-
Koha/Patron/Categories.pm | 13 ++
Koha/Template/Plugin/Categories.pm | 20 +--
acqui/add_user_search.pl | 6 +-
admin/add_user_search.pl | 6 +-
admin/item_circulation_alerts.pl | 6 +-
admin/patron-attr-types.pl | 9 +-
admin/smart-rules.pl | 13 +-
circ/circulation.pl | 7 +-
debian/templates/plack.psgi | 1 -
.../prog/en/includes/patron-search.inc | 10 +-
.../prog/en/modules/admin/smart-rules.tt | 8 +-
.../prog/en/modules/members/member.tt | 4 +-
.../prog/en/modules/members/update-child.tt | 69 ++++----
.../prog/en/modules/reports/bor_issues_top.tt | 6 +-
.../prog/en/modules/reports/borrowers_out.tt | 6 +-
.../prog/en/modules/reports/borrowers_stats.tt | 15 +-
.../prog/en/modules/reports/cat_issues_top.tt | 6 +-
.../prog/en/modules/reports/issues_avg_stats.tt | 4 +-
.../modules/reports/issues_by_borrower_category.tt | 4 +-
members/boraccount.pl | 9 +-
members/guarantor_search.pl | 6 +-
members/mancredit.pl | 9 +-
members/maninvoice.pl | 9 +-
members/member-flags.pl | 9 +-
members/member-password.pl | 11 +-
members/member.pl | 1 -
members/memberentry.pl | 53 +++---
members/members-home.pl | 5 +-
members/members-update-do.pl | 1 -
members/members-update.pl | 1 -
members/moremember.pl | 9 +-
members/nl-search.pl | 7 +-
members/pay.pl | 14 +-
members/paycollect.pl | 14 +-
members/printfeercpt.pl | 8 +-
members/printinvoice.pl | 9 +-
members/readingrec.pl | 9 +-
members/update-child.pl | 31 ++--
misc/plack/koha.psgi | 3 +-
patroncards/add_user_search.pl | 6 +-
reports/bor_issues_top.pl | 19 +-
reports/borrowers_out.pl | 15 +-
reports/borrowers_stats.pl | 35 ++--
reports/cat_issues_top.pl | 16 +-
reports/guided_reports.pl | 12 +-
reports/issues_avg_stats.pl | 24 +--
reports/issues_by_borrower_category.plugin | 15 +-
reports/issues_stats.pl | 28 +--
reports/reserves_stats.pl | 16 +-
serials/add_user_search.pl | 6 +-
t/db_dependent/Category.t | 62 -------
t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 1 -
t/db_dependent/Circulation/GetIssues.t | 6 +-
t/db_dependent/Koha/Patron/Categories.t | 29 +++-
t/db_dependent/Members/GetAllIssues.t | 1 -
t/db_dependent/Members/GetOverdues.t | 1 -
t/db_dependent/Members/GetPendingIssues.t | 1 -
t/db_dependent/Members/IssueSlip.t | 1 -
t/db_dependent/Ratings.t | 4 +-
t/db_dependent/Reserves.t | 3 +-
t/db_dependent/Utils/Datatables_Members.t | 3 +-
t/db_dependent/Utils/Datatables_Virtualshelves.t | 3 +-
tools/cleanborrowers.pl | 5 +-
tools/import_borrowers.pl | 7 +-
tools/modborrowers.pl | 12 +-
tools/overduerules.pl | 35 ++--
70 files changed, 357 insertions(+), 739 deletions(-)
delete mode 100644 C4/Category.pm
delete mode 100755 t/db_dependent/Category.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list