[koha-commits] main Koha release repository branch master updated. v19.11.00-1325-g9ce0dd6b92
Git repo owner
gitmaster at git.koha-community.org
Mon Mar 23 15:15:34 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 9ce0dd6b9225328e49098b69201767f240b47270 (commit)
via e8c6fcb8a0aff24fae155c1260c37b007da3da4a (commit)
via ea5e9f25e9cbeae9e12dd05e17175ae3203a92b2 (commit)
via 994ea386c389886ced62dc42bc10d0325557876c (commit)
via fc430529c1ea686d3727ce786a619441f1763a0a (commit)
via 8bcfd1c21177d98b0c7b839092befaa78993baeb (commit)
via 4bad6ec25feceb9a1a7701b5f7ac113f9a1ffa1b (commit)
via 6bb806ddf41c8263758948bf82dd0a41dda406b6 (commit)
via 7e1be8d385f681f83112e8dd445dd519cb6b6124 (commit)
via 569e4080f10bdaf8dc5250cee0a168c31b066909 (commit)
via 1e9622786f72b61ed884b554e8dff53c09842867 (commit)
via e3cc65156ecf5bc8d78edb8c741ab5afb2ffdb67 (commit)
via e37bfe3e4b395ef71a54c65226829248847cf1ce (commit)
via bffb16eb70c4cd08a8127b38d4672073dff37b99 (commit)
via 836e950d25148ca04ed0561c487772e3b0f7f8ee (commit)
via 4428d086575cf2df94261f33b89b37150b4215f9 (commit)
via 37e634bb5b99ab4bcdba45062527ad6bfe439f47 (commit)
via 837c9cdb21d695604879e7eb47b96234132012b8 (commit)
via f1d210019b1f87465a8bad33f57ba6d20bec65f9 (commit)
via 5dd44a8f088c5c8537d0e0046a34d57655f2b7fd (commit)
via ccfc6572f79eccbf8abae9c4645213ae6d33fa38 (commit)
via a1e3a79913869619160cea7944b4ad653b8da9a4 (commit)
via 6f4460901bd6857c46a557ca7b03b4506cee1a08 (commit)
via 52949f88e0110e52b965bedbdcb885bdb5b00eaf (commit)
via 9707167a482894f270549ae9633eaef980f1ed35 (commit)
via 85012cc0616371b1c29a4eab39829ef9d250d266 (commit)
via 1dc9daf5b373a5d8f80fa5f7e3880cff239201c5 (commit)
via 37f464e1cf716db97b5b07b5b82811f0d5f64e63 (commit)
via 956c1a2a26f6663e1620492e67c6a9b20ef3fe94 (commit)
from 757ca57bfdbd4346b90293429e658d239b8d0102 (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 9ce0dd6b9225328e49098b69201767f240b47270
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 20 10:58:54 2020 +0100
Bug 20443: Fix merge_with behavior
merge_with were returning Koha::Patron::Attribute for existing attribute
and hashref for new attribute.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e8c6fcb8a0aff24fae155c1260c37b007da3da4a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 20 09:38:03 2020 +0100
Bug 20443: Handle non existent attribute when importing patrons
There is much more to do here, but this patch has the same behavior than
before: a warn is displayed in the log, the UI is not aware of it
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ea5e9f25e9cbeae9e12dd05e17175ae3203a92b2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 9 11:43:14 2020 +0100
Bug 20443: Fix patron modification approval
There was a mismatch between "value" and "attribute". Before this
patchset, "value" was sometimes used, but then it comes "attribute" to
match the DB column's name.
We must keep both here, when an upgrade is done we could have "value"
that is still in the borrower_modifications.extended_attributes JSON
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 994ea386c389886ced62dc42bc10d0325557876c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 9 11:02:54 2020 +0100
Bug 20443: Do not explode if attribute does not have a valid av
Template process failed: undef error -
Can't call method "lib" on an undefined value at /kohadevbox/koha/Koha/Patron/Attribute.pm line 109.
at /kohadevbox/koha/C4/Templates.pm line 122
We should not crash as it if the attribute is linked to an invalid
authorised value (for instance the AV has been deleted)
We must provide a check in the search_for_data_inconsistencies.pl script
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fc430529c1ea686d3727ce786a619441f1763a0a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 4 15:44:42 2020 +0100
Bug 20443: Fix creation of new patron with attributes
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8bcfd1c21177d98b0c7b839092befaa78993baeb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 21 13:03:56 2020 +0100
Bug 20443: Fix POD
Fixes the following failures:
FAIL Koha/Patron/Attribute.pm
FAIL pod
*** ERROR:
empty =head3
in file Koha/Patron/Attribute.pm
*** ERROR:
empty =head3
in file Koha/Patron/Attribute.pm
FAIL Koha/Patron/Attributes.pm
FAIL pod
*** ERROR:
empty =head3
in file Koha/Patron/Attributes.pm
FAIL pod coverage
POD is missing for merge_with
POD is missing for object_class
FAIL Koha/Patrons.pm
FAIL spelling
paramter ==> parameter
except the missing pod for object_class, not needed.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4bad6ec25feceb9a1a7701b5f7ac113f9a1ffa1b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 3 19:30:44 2019 +0100
Bug 20443: Fix add/edit for checkboxes
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6bb806ddf41c8263758948bf82dd0a41dda406b6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 27 15:49:36 2019 +0100
Bug 20443: Fix Patrons/Import.t
->get_patrons has been removed but not replaced!
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7e1be8d385f681f83112e8dd445dd519cb6b6124
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 27 15:35:07 2019 +0100
Bug 20443: Use search_with_library_limits for attribute types
Dealt with that previously in the module during the rebase.
It conflicted with bug 23281.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 569e4080f10bdaf8dc5250cee0a168c31b066909
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 29 11:49:04 2019 -0400
Bug 20443: Fix Auth_with_ldap.t
Must be a hashref
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1e9622786f72b61ed884b554e8dff53c09842867
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Mar 7 07:23:33 2019 +0000
Bug 20443: (follow-up) Fix t/db_dependent/Koha/Patrons.t
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e3cc65156ecf5bc8d78edb8c741ab5afb2ffdb67
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 9 19:46:35 2018 -0300
Bug 20443: (follow-up) Move GetBorrowerAttributes to Koha::Patron - ILSDI
Either we display everything, or only the info from the attribute itself
(i.e. not its type)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e37bfe3e4b395ef71a54c65226829248847cf1ce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 17 11:03:49 2018 -0300
Bug 20443: Remove extended_attributes_code_value_arrayref AND C4::Members::Attributes
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bffb16eb70c4cd08a8127b38d4672073dff37b99
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 17 09:50:10 2018 -0300
Bug 20443: Remove extended_attributes_merge
TODO We need tests here!
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 836e950d25148ca04ed0561c487772e3b0f7f8ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 16 14:23:27 2018 -0300
Bug 20443: Remove SearchIdMatchingAttribute
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4428d086575cf2df94261f33b89b37150b4215f9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 16 20:34:42 2018 -0300
Bug 20443: Remove SearchIdMatchingAttribute - prove we are not cheating
Tests are still passing that way, we can continue
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 37e634bb5b99ab4bcdba45062527ad6bfe439f47
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 16 20:17:22 2018 -0300
Bug 20443: Remove C4::Members::AttributeTypes
We do no longer need this package, we can use
Koha::Patron::Attribute::Types directly instead.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 837c9cdb21d695604879e7eb47b96234132012b8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 16 19:37:30 2018 -0300
Bug 20443: Remove num_patron
Replace C4::Members::AttributeTypes->num_patron with
Koha::Patrons->filter_by_attribute_type
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f1d210019b1f87465a8bad33f57ba6d20bec65f9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 16 19:04:03 2018 -0300
Bug 20443: Move C4::Members::AttributeTypes::GetAttributeTypes to Koha::Patron::Attribute::Types
We can then now start to move methods from C4::Members::AttributeTypes
as well.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5dd44a8f088c5c8537d0e0046a34d57655f2b7fd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 16:40:14 2018 -0300
Bug 20443: Remove CheckUniqueness
There is already a method in Koha::Patron::Attribute to check the
uniqueness constraint, let us it to replace CheckUniqueness
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ccfc6572f79eccbf8abae9c4645213ae6d33fa38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 14:11:44 2018 -0300
Bug 20443: Remove UpdateBorrowerAttribute and SetBorrowerAttributes
This patch replace Koha::Patron->get_extended_attributes with
->extended_attributes
It's now a getter a setter method.
It permits to replace UpdateBorrowerAttribute and use
create_related from DBIx::Class
Notes:
* We face the same variable names difference than in a previous patch
(value vs attribute)
Bug 20443: Remove SetBorrowerAttributes
squash + RM get_extended_attributes
RM get_extended_attributes
SQUASH Bug 20443: Remove UpdateBorrowerAttribute and SetBorrowerAttribute
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a1e3a79913869619160cea7944b4ad653b8da9a4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 13:07:05 2018 -0300
Bug 20443: Remove DeleteBorrowerAttribute
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6f4460901bd6857c46a557ca7b03b4506cee1a08
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 12:42:08 2018 -0300
Bug 20443: Remove DeleteBorrowerAttributes
This subroutine was only used once, easy to replace.
SetBorrowerAttributes must replace the attributes for the ones logged-in
user is allowed to edit, that's why we filter by the library limits
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 52949f88e0110e52b965bedbdcb885bdb5b00eaf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 12:10:47 2018 -0300
Bug 20443: Improve filtering method
Koha::Patron::Attributes->search mimicks what is done in
Koha::AuthorisedValues->search.
But actually it should be more explicit when the caller use it.
For instance filter_by_branch_limitation (see discussion on bug 11983).
This will be useful for the following patches as we will need a way to
replace the $no_branch_limit flag.
When the $no_branch_limit flag is called, a simple ->search call should
be done.
When we want to limit on a specific library we can pass the branchcode
in paramter of filter_by_branch_limitation (this is not used yet).
If not passed the logged-in user library will be used by default.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9707167a482894f270549ae9633eaef980f1ed35
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 12 18:26:58 2018 -0300
Bug 20443: Move GetBorrowerAttributes to Koha::Patron->extended_attributes
The GetBorrowerAttributes subroutine return the attributes for a given
patron.
Using get_extended_attributes we can acchieve it easily. The problematic
here is to restore the method's name (value vs attribute,
value_description vs description of the authorised value, as well as
display_checkout that should not be a method of Attribute, but
Attribute::Type instead)
value_description was used when the attribute types were attached to an
authorised value category. To avoid the necessary test in template and
controller there is now a $attribute->description method that will
display either the attribute's value OR the value of the authorised
value when needed. We should certainly use this one from few other
places.
Notes:
* This patch rename Koha::Patron->attributes with Koha::Patron->get_extended_attributes.
It will be renamed with Koha::Patron->extended_attributes in ones of the next
patches when it will become a setter as well.
* GetBorrowerAttributes did not care about the library limits, we still
do not
* The opac_only flag was not used outside of test, we drop it off.
* To maintain the existing behavior we add a default order-by clause to
the search method [code, attribute]
* From C4::Letters::_parseletter we always display the staff description
of the AV, There is now a FIXME to warn about it
* FIXMEs are not regressions, existing behaviors must be kept
* TODO add a new check to bug 21010 to search for inconsistencies in
patron's attributes attached to non-existent authorised values
* One test has been updated in Modifications.t, order_by is now
by default set to ['code', 'attribute']
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 85012cc0616371b1c29a4eab39829ef9d250d266
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 09:01:03 2018 -0300
Bug 20443: Move GetBorrowerAttributes to Koha::Patron - ILSDI
FIXME See comment
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1dc9daf5b373a5d8f80fa5f7e3880cff239201c5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jul 12 17:20:57 2018 -0300
Bug 20443: Move GetBorrowerAttributeValue to Koha::Patron->get_extended_attribute_value
We want to retrieve a specific patron's attribute for a given patron.
We then add a new method to Koha::Patron.
This patch add a getter method ->get_extended_attribute_value
to use the DBIx::Class relation
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 37f464e1cf716db97b5b07b5b82811f0d5f64e63
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 17 11:13:09 2018 -0300
Bug 20443: Remove opac_display and opac_editable from Patron::Attribute
Same as previously for methods that have been added by bug 17792.
It's better to be explicite and tell we are fetch the related attribute's type
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 956c1a2a26f6663e1620492e67c6a9b20ef3fe94
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 13 10:41:15 2018 -0300
Bug 20443: Revert some stuffs from 12159
These methods have been added to Koha::Patron::Attribute but are wrong, see bug 18339
We should use ->type->$method instead
Moreover the tests exist in another subtest, we do not need them.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_ldap.pm | 27 +-
C4/ILSDI/Services.pm | 17 +-
C4/Letters.pm | 11 +-
C4/Members.pm | 1 -
C4/Members/AttributeTypes.pm | 519 ---------------------
C4/Members/Attributes.pm | 376 ---------------
C4/Utils/DataTables/Members.pm | 5 +-
Koha/Patron.pm | 71 ++-
Koha/Patron/Attribute.pm | 110 ++---
Koha/Patron/Attributes.pm | 104 ++++-
Koha/Patron/Modification.pm | 11 +-
Koha/Patron/Modifications.pm | 2 +-
Koha/Patrons.pm | 36 ++
Koha/Patrons/Import.pm | 77 +--
Koha/Schema/Result/BorrowerAttribute.pm | 15 +
Koha/Template/Plugin/Branches.pm | 23 +-
admin/patron-attr-types.pl | 188 +++-----
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 10 +-
.../prog/en/modules/admin/patron-attr-types.tt | 96 ++--
.../prog/en/modules/members/moremember.tt | 8 +-
.../prog/en/modules/tools/modborrowers.tt | 3 +-
members/memberentry.pl | 77 +--
members/moremember.pl | 16 +-
opac/opac-memberentry.pl | 26 +-
opac/opac-user.pl | 8 +-
reports/borrowers_stats.pl | 14 +-
reports/issues_stats.pl | 8 +-
t/Members_AttributeTypes.t | 75 ---
t/Members_Attributes.t | 98 ----
t/db_dependent/Auth_with_ldap.t | 12 +-
t/db_dependent/ILSDI_Services.t | 10 +-
t/db_dependent/Koha/Patron/Attribute/Types.t | 2 +
t/db_dependent/Koha/Patron/Attributes.t | 143 +-----
t/db_dependent/Koha/Patron/Modifications.t | 21 +-
t/db_dependent/Koha/Patrons.t | 226 +++++++--
t/db_dependent/Koha/Patrons/Import.t | 20 +-
t/db_dependent/Members/Attributes.t | 240 ----------
t/db_dependent/Utils/Datatables_Members.t | 44 +-
tools/import_borrowers.pl | 7 +-
tools/modborrowers.pl | 61 +--
40 files changed, 814 insertions(+), 2004 deletions(-)
delete mode 100644 C4/Members/AttributeTypes.pm
delete mode 100644 C4/Members/Attributes.pm
delete mode 100755 t/Members_AttributeTypes.t
delete mode 100755 t/Members_Attributes.t
delete mode 100644 t/db_dependent/Members/Attributes.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list