Bugzilla – Attachment 87291 Details for
Bug 21890
Allow forgotten password functionality to be limited by patron category
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21890: Add Koha::Patron::Category->effective_reset_password method
Bug-21890-Add-KohaPatronCategory-effectiveresetpas.patch (text/plain), 4.65 KB, created by
Martin Renvoize (ashimema)
on 2019-04-01 17:53:30 UTC
(
hide
)
Description:
Bug 21890: Add Koha::Patron::Category->effective_reset_password method
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-04-01 17:53:30 UTC
Size:
4.65 KB
patch
obsolete
>From bbc315f018384e1e33c36974e25ecddd354f025c Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Tue, 5 Feb 2019 16:44:14 -0300 >Subject: [PATCH] Bug 21890: Add > Koha::Patron::Category->effective_reset_password method > >This method checks wether the local $self->reset_password is set to >override the OpacResetPassword syspref (i.e. if it is set to a bool) or >undef, in which case if falls back to the value of the syspref. > >To test: >- Apply this patches >- Make sure the DB is updated: > $ updatedatabase >- Update the schema files: > $ dbic >- Run: > $ kshell > k$ prove t/db_dependent/Koha/Patron/Category.t >=> SUCCESS: Tests pass! >- Sign off :-D > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/Patron/Category.pm | 17 ++++++ > t/db_dependent/Koha/Patron/Category.t | 88 +++++++++++++++++++++++++++ > 2 files changed, 105 insertions(+) > create mode 100644 t/db_dependent/Koha/Patron/Category.t > >diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm >index c96764bfde..f614d5b0bc 100644 >--- a/Koha/Patron/Category.pm >+++ b/Koha/Patron/Category.pm >@@ -224,6 +224,23 @@ sub get_expiry_date { > } > } > >+=head3 effective_reset_password >+ >+Returns if patrons in this category can reset their password. If set in $self->reset_password >+or, if undef, falls back to the OpacResetPassword system preference. >+ >+=cut >+ >+sub effective_reset_password { >+ my ($self) = @_; >+ >+ return ( defined $self->reset_password ) >+ ? $self->reset_password >+ : C4::Context->preference('OpacResetPassword'); >+} >+ >+=head2 Internal methods >+ > =head3 type > > =cut >diff --git a/t/db_dependent/Koha/Patron/Category.t b/t/db_dependent/Koha/Patron/Category.t >new file mode 100644 >index 0000000000..1b4938e9f9 >--- /dev/null >+++ b/t/db_dependent/Koha/Patron/Category.t >@@ -0,0 +1,88 @@ >+#!/usr/bin/perl >+ >+# Copyright 2019 Koha Development team >+# >+# This file is part of Koha >+# >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. >+# >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. >+# >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. >+ >+use Modern::Perl; >+ >+use Test::More tests => 1; >+ >+use t::lib::TestBuilder; >+use t::lib::Mocks; >+ >+use Koha::Database; >+ >+my $schema = Koha::Database->new->schema; >+my $builder = t::lib::TestBuilder->new; >+ >+subtest 'effective_reset_password() tests' => sub { >+ >+ plan tests => 2; >+ >+ subtest 'specific overrides global' => sub { >+ >+ plan tests => 4; >+ >+ $schema->storage->txn_begin; >+ >+ my $category = $builder->build_object({ >+ class => 'Koha::Patron::Categories', >+ value => { >+ reset_password => 1 >+ } >+ }); >+ >+ t::lib::Mocks::mock_preference( 'OpacResetPassword', 0 ); >+ ok( $category->effective_reset_password, 'OpacResetPassword unset, but category has the flag set to 1' ); >+ >+ t::lib::Mocks::mock_preference( 'OpacResetPassword', 1 ); >+ ok( $category->effective_reset_password, 'OpacResetPassword set and category has the flag set to 1' ); >+ >+ # disable >+ $category->reset_password( 0 )->store->discard_changes; >+ >+ t::lib::Mocks::mock_preference( 'OpacResetPassword', 0 ); >+ ok( !$category->effective_reset_password, 'OpacResetPassword unset, but category has the flag set to 0' ); >+ >+ t::lib::Mocks::mock_preference( 'OpacResetPassword', 1 ); >+ ok( !$category->effective_reset_password, 'OpacResetPassword set and category has the flag set to 0' ); >+ >+ $schema->storage->txn_rollback; >+ }; >+ >+ subtest 'no specific rule, global applies' => sub { >+ >+ plan tests => 2; >+ >+ $schema->storage->txn_begin; >+ >+ my $category = $builder->build_object({ >+ class => 'Koha::Patron::Categories', >+ value => { >+ reset_password => undef >+ } >+ }); >+ >+ t::lib::Mocks::mock_preference( 'OpacResetPassword', 0 ); >+ ok( !$category->effective_reset_password, 'OpacResetPassword set to 0 used' ); >+ >+ t::lib::Mocks::mock_preference( 'OpacResetPassword', 1 ); >+ ok( $category->effective_reset_password, 'OpacResetPassword set to 1 used' ); >+ >+ $schema->storage->txn_rollback; >+ }; >+}; >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21890
:
84595
|
84596
|
84597
|
84598
|
84631
|
84632
|
84633
|
84634
|
85001
|
85002
|
85003
|
85004
|
85005
|
85006
|
86843
|
86844
|
86845
|
86846
|
86847
|
86866
|
86867
|
86868
|
86869
|
86870
|
86911
|
87289
|
87290
| 87291 |
87292
|
87293
|
87294
|
87295