[koha-commits] main Koha release repository branch master updated. v18.11.00-1120-g7e218b8
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 12 15:17:19 CEST 2019
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 7e218b81e6f7e4cf8bb8be3aef547cd1c1aac573 (commit)
via 76599035cb9f604ea4a94928c82cc8efb396ea73 (commit)
via 8c1bd93a3b1fd37e157173e8a1e813def70b1fa3 (commit)
via 7205a02a19885d3a1baaab56c8e8749635501104 (commit)
via 861fe06ab72be3d905ee5aaa1eca273454354a7a (commit)
via e155e6d5bba7b48245b2679d5f0b28d46761db93 (commit)
via d96fc928560e5353a805ec079bbde26a7e8dc4ce (commit)
via a6466f1f3b02915f0c4e578ce13455ad3aacf46c (commit)
via 13f953317a64f66303db46424baacf15d962c0bd (commit)
via 6388ffd7025290b1ca3e4c9b7a1ae67dfb63ed72 (commit)
via 0059dc5a4041f13db11689f9df1bc6475ab45172 (commit)
via 376d1a70232e7c0e96adbd7c5300ce593c0e120a (commit)
via e55b627603450313954b98704e73d0baa3ed56f9 (commit)
via dea4f3caaadabc8977453615eb162d8403fa5b5d (commit)
via e8fc66f0f612ce6516089894b28899522d13021e (commit)
via ace782a1f354c675661d70fa9714ed114364c4b9 (commit)
via 698efcc0aa2ae48b879b843857e6f12316d5ba83 (commit)
via a0e61d8c3e94f2b9e990cc2b60668187047b24bb (commit)
from 8eb22efa0893849e2967e34c821c018c6405f8d3 (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 7e218b81e6f7e4cf8bb8be3aef547cd1c1aac573
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 12 02:52:58 2019 +0000
Bug 21953: (follow-up) Fix test count
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 76599035cb9f604ea4a94928c82cc8efb396ea73
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 12 02:52:02 2019 +0000
Bug 10796: Schema changes
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8c1bd93a3b1fd37e157173e8a1e813def70b1fa3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 12 02:41:53 2019 +0000
Bug 10796: DBRev 18.12.00.045
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7205a02a19885d3a1baaab56c8e8749635501104
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 12 02:36:26 2019 +0000
Bug 21890: DBRev 18.12.00.044
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 861fe06ab72be3d905ee5aaa1eca273454354a7a
Author: Liz Rea <wizzyrea at gmail.com>
Date: Wed Mar 27 19:16:56 2019 +0000
Bug 10796: (QA follow-up) Changing password recovery verbiage for users who are disallowed online password resets
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e155e6d5bba7b48245b2679d5f0b28d46761db93
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 20 13:58:35 2019 -0300
Bug 10796: Use $category->effective_change_password in the OPAC
This patch makes the OPAC pages that rely on OpacPasswordChange use the
current patron's category to make the decision to allow password change
or not.
It does so by making sure all the places in which OpacPasswordChange was
used, use $logged_in_user->category->effective_change_password instead.
Special attention is required on the case of opac-registration-verify.pl
in which the use of an unblessed Koha::Patron object is changed in
favour of the blessed object, so we can actually use the new method to
make a decision on the text to display.
To test:
- Go through the OPAC pages, check that the password change strings and
links are displayed only whne appropriate.
- Sign off :-D
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d96fc928560e5353a805ec079bbde26a7e8dc4ce
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 20 13:36:55 2019 -0300
Bug 10796: Handle can_change_password on the staff interface
This patch makes the staff interface handle the new flag when editing
the categories. I didn't add the flag to the list of categories table
because it makes it too big, but can be easily added if required by
users or QA.
To test:
- Along with other patches from this bug, edit patron categories
=> SUCCESS: Notice the changes are correctly stored
- Sign off :-D
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a6466f1f3b02915f0c4e578ce13455ad3aacf46c
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 20 13:26:18 2019 -0300
Bug 10796: Add Koha::Patron::Category->effective_change_password method
This method checks whether the local $self->change_password is set to
override the OpacPasswordChange syspref (i.e. if it is set to a
bool) or undef, in which case it 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 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 13f953317a64f66303db46424baacf15d962c0bd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 20 13:18:00 2019 -0300
Bug 10796: DB update
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6388ffd7025290b1ca3e4c9b7a1ae67dfb63ed72
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Apr 1 18:46:21 2019 +0100
Bug 21890: (QA follow-up) Use List::Util::any
When possible it's a good idea to use `any` from List::Util to shortcut
on the first occurence of a truthy value.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0059dc5a4041f13db11689f9df1bc6475ab45172
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Mar 22 11:22:00 2019 -0300
Bug 21890: Wrap message in span
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 376d1a70232e7c0e96adbd7c5300ce593c0e120a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jan 31 16:29:30 2019 -0300
Bug 21890: Allow restricting password resets by patron category
This patch makes the templates relying on the OpacResetPassword syspref
use the introduced TT plugin method instead by changing:
[% IF Koha.Preference('OpacResetPassword') %]
=>
[% IF Categories.can_any_reset_password %]
To test:
- Verify that all the places in which the 'forgot password' link is
displayed in OPAC keep working, provided there's at least one category
that has the flag set
- Attempt to recover the password for a patron that belong to a valid
category (i.e. that has the flag set)
=> SUCCESS: You can go through the normal process
- Attempt to recover the password for a patron that belongs to a
category with the flag unset.
=> SUCCESS: Once Koha identifies your category, you are told you are not
allowed to do it
- Sign off :-D
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e55b627603450313954b98704e73d0baa3ed56f9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jan 31 16:27:10 2019 -0300
Bug 21890: Add can_any_reset_password() to the Categories TT plugin
This patch introduces a method to the Koha::Template::Plugin::Categories
TT plugin. This methods queries for categories filtering them by
effective_reset_password flag set, and returns a boolean representing the fact
that there's at least one category allowed.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Template/Plugin/Categories.t
=> SUCCESS: Tests pass!
- Sign off :-D
Caveat: this patch/tests require the schema to be updated
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dea4f3caaadabc8977453615eb162d8403fa5b5d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Feb 5 16:44:14 2019 -0300
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 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e8fc66f0f612ce6516089894b28899522d13021e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jan 31 16:28:39 2019 -0300
Bug 21890: Handle can_reset_password on the staff interface
This patch makes the staff interface handle the new flag when editing
the categories. I didn't add the flag to the list of categories table
because it makes it too big, but can be easily added if required by
users or QA.
To test:
- Along with other patches from this bug, edit patron categories
=> SUCCESS: Notice the changes are correctly stored
- Sign off :-D
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ace782a1f354c675661d70fa9714ed114364c4b9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jan 31 16:25:59 2019 -0300
Bug 21890: DB updates
This patch adds a new column to the categories table:
'reset_password' which is a boolean, and represents, well... that. The
value itself is nullable.
The idea is that OpacResetPassword governs the general behaviour, and
this can be overriden at category-level.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 698efcc0aa2ae48b879b843857e6f12316d5ba83
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 29 19:01:19 2019 +0000
Bug 21582: Use CodeMirror for *UserJS & *UserCSS
This patch adds CodeMirror syntax highlighting by default to JS and CSS
system preferences. HTML preferences will use CodeMirror editors if
UseWYSIWYGinSystemPreferences is disabled.
Three new CodeMirror files are added to support three new syntax
highlighting modes: XML (for HTML), CSS, and JS.
A new option is added to *.pref file configurations for textareas which
are intended for HTML, JS, or CSS: syntax. This option is passed to the
CodeMirror configuration to control syntax highlighting mode.
Textareas without a syntax option specified will not have CodeMirror
enabled.
To test, apply the patch and go to Administration -> System preferences.
Test the behavior of several preferences which use <textarea> as their
input. For example:
- OPACUserJS (JS)
- IntranetUserCSS (CSS)
- OpacHeader (HTML)
- BibtexExportAdditionalFields (no highlighting)
Text entry in each of these should have the correct syntax highlighting
applied to them. All data should be saved correctly.
Test with UseWYSIWYGinSystemPreferences both on and off.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a0e61d8c3e94f2b9e990cc2b60668187047b24bb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Mar 27 08:35:27 2019 -0400
Bug 22594: Validate SMS messaging numbers using the E.164 format
Many SMS messaging services reject numbers that do not conform to the E.164 international public telecommunication
numbering plan.
We already tell patrons on the OPAC "Please enter numbers only. (123) 456-7890 would be entered as 1234567890."
but we do not enforce this. We should be validating the patron's SMS number on both the staff side and the patron
self-service for updating the SMS number.
Test plan:
1) Apply this patch
2) Enable SMS message ( you can set to Email to enable )
3) Test entering and updating SMS numbers on the OPAC and staff
interfaces.
4) Note you can only enter a 1 to 14 digit number with an optional + sign
at the beginning ( used to indicate the number includes a country calling code )
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Patron/Category.pm | 32 +
Koha/Schema/Result/Category.pm | 18 +-
Koha/Template/Plugin/Categories.pm | 12 +
admin/categories.pl | 9 +
admin/preferences.pl | 4 +-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/updatedatabase.pl | 30 +
koha-tmpl/intranet-tmpl/lib/codemirror/css.js | 833 ++++++++++++++++++
koha-tmpl/intranet-tmpl/lib/codemirror/css.min.js | 1 +
.../intranet-tmpl/lib/codemirror/javascript.js | 900 ++++++++++++++++++++
.../intranet-tmpl/lib/codemirror/javascript.min.js | 1 +
koha-tmpl/intranet-tmpl/lib/codemirror/xml.js | 402 +++++++++
koha-tmpl/intranet-tmpl/lib/codemirror/xml.min.js | 1 +
koha-tmpl/intranet-tmpl/prog/css/preferences.css | 6 +
.../prog/en/includes/validator-strings.inc | 3 +-
.../prog/en/modules/admin/categories.tt | 64 ++
.../prog/en/modules/admin/preferences.tt | 18 +-
.../en/modules/admin/preferences/cataloguing.pref | 1 +
.../en/modules/admin/preferences/circulation.pref | 6 +
.../prog/en/modules/admin/preferences/opac.pref | 43 +-
.../en/modules/admin/preferences/staff_client.pref | 4 +
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 3 +-
.../prog/en/modules/members/memberentrygen.tt | 1 +
koha-tmpl/intranet-tmpl/prog/js/members.js | 12 +
.../intranet-tmpl/prog/js/pages/preferences.js | 51 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 3 +-
.../opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 3 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 3 +-
.../bootstrap/en/modules/opac-messaging.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 4 +-
.../bootstrap/en/modules/opac-password-recovery.tt | 5 +-
.../en/modules/opac-registration-confirmation.tt | 8 +-
opac/opac-memberentry.pl | 3 -
opac/opac-passwd.pl | 2 +-
opac/opac-password-recovery.pl | 58 +-
opac/opac-registration-verify.pl | 5 +-
t/db_dependent/Circulation.t | 2 +-
t/db_dependent/Koha/Patron/Category.t | 146 ++++
t/db_dependent/Template/Plugin/Categories.t | 26 +-
41 files changed, 2649 insertions(+), 82 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/css.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/css.min.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/javascript.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/javascript.min.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/xml.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/xml.min.js
create mode 100644 t/db_dependent/Koha/Patron/Category.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list