[koha-commits] main Koha release repository branch master updated. v18.11.00-949-g3c69e08
Git repo owner
gitmaster at git.koha-community.org
Thu Mar 28 14:44:58 CET 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 3c69e084d7b1fd75dd04f5dc35fb99ceca9efb39 (commit)
via e0b9d98827fa616f622e296254259ad475b742a2 (commit)
via 1218364dbea4d99b56b4abb0a4e77136a0c8d479 (commit)
via 4fe300dec1937a7dc739573bc502fc566a55587d (commit)
via 100e1e758c622234d1a176b1cdb45def8443833f (commit)
via 92af7e53130304d27e5b0d9d531a89628c8ba1be (commit)
via cc2a62bdee88908edb429155ae0d274ee9a6dfdb (commit)
via 9a321c128fed457bf6d11d2ce7ee7edf7dd28004 (commit)
via b0e5790947df32383864466724a3e4838ee659bd (commit)
via 2153d851a094c6617551381899f8ec54d9e2fb0e (commit)
via c7e48b0a1ad72b36445bc5d4202adb1b34bb8387 (commit)
via 7ac1457ffc27cf6ec5a3a7bab6abc8a010e02b6a (commit)
via 50be1c4006e0a1d7e3b537bd849bc77f7a6bb56f (commit)
via 3ef48c8708736e9d5b16e462e520302c007cb4c1 (commit)
via e2f6542e1ebbd15977b47c86d2a9ef55fa0c5e9b (commit)
via 0cd4ca289bd2e1bd11fdbd015225a909971ce213 (commit)
via 28e7f1d4e7a114b04d6940463f47351466a638dd (commit)
via 53b059afbb5731373a92a3ebaaceea4e1d656363 (commit)
via 65f35447e93008810cec3eba63a286b9940d5824 (commit)
via a993bd3843fdfcf3a7f2df916299b32d4601b879 (commit)
from 2be687c419298478c1937f37ce0654ea7bc8bc9e (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 3c69e084d7b1fd75dd04f5dc35fb99ceca9efb39
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 22 10:52:16 2019 +0000
Bug 12159: (QA follow-up) Remove double use module
Speaks for itself.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e0b9d98827fa616f622e296254259ad475b742a2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 22 10:49:03 2019 +0000
Bug 12159: (QA follow-up) Rename relation in Patron::Attributes
It seems that we do not need the extra belongs_to in the schema result
files if we rename the relation to code.
Test plan:
Run t/db_dependent/Koha/Patrons.t
Run t/db_dependent/Koha/Patron/Attributes.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1218364dbea4d99b56b4abb0a4e77136a0c8d479
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Mar 16 11:03:23 2018 +0000
Bug 12159: Add tests
Test plan:
prove t/db_dependent/Koha/Patron/Attributes.t t/db_dependent/Koha/Patrons.t
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4fe300dec1937a7dc739573bc502fc566a55587d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Mar 15 13:12:55 2018 +0000
Bug 12159: Fix getting extended patron attributes for circ-menu
Changes:
- Replace getting preference ExtendedPatronAttributes by Koha.Preference
in templates
- Add Koha::Patron->attributes for getting patrons extended attributes
- Use this method in circ-menu.inc
- Remove getting attributes from members perl scripts
Test plan:
0) Apply the patch
1) Add some patron attributes type - with free text, authorised value,
limited by libraries...
2) Add some values to this attributes for some patrons
3) Go through as many patron pages as you can and confirm that
attributes are shown at side panel when they shoul and are not shown
when they should not be shown
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
[EDIT] Removed Koha/Schema/Result/BorrowerAttribute.pm
[EDIT] Added missing semicolon on L114 in Koha/Patron/Attribute.pm
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 100e1e758c622234d1a176b1cdb45def8443833f
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Mar 27 16:04:13 2019 +0000
Bug 10577: (QA follow-up) Remove tab chars
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 92af7e53130304d27e5b0d9d531a89628c8ba1be
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Mar 13 11:16:09 2019 +0000
Bug 10577: (QA follow-up) Remove bad call signature
Whilst working through this patch for signoff I found a case where the
calling signature of GetBudgetPeriod was incorrect. I removed the
superflous passed parameter in this followup
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cc2a62bdee88908edb429155ae0d274ee9a6dfdb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Jul 11 16:41:26 2013 +0000
Bug 10577: Improve semantics of GetBudgetPeriod()
Remove the option to pass zero to this function in
order to get "the" active budget. This was a problem
in three ways:
- Koha doesn't require that there be only one active
budget at a time, so the concept of "the" active
budget doesn't make sense.
- Having the single parameter be either an ID or a flag
based on its value is poor function design.
- No callers of GetBudgetPeriod() were actually using this
modality.
This patch also improves the DB-dependent tests for budgets by
- wrapping the test in a transaction
- counting budgets correctly
To test:
[1] Apply the patch.
[2] Verify that prove -v t/db_dependent/Budgets.t passes
[3] Verify in the staff interface that:
- the budget hierarchy displays correctly
- you can add and modify a budget
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Rescued-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9a321c128fed457bf6d11d2ce7ee7edf7dd28004
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 19 12:41:26 2019 +0000
Bug 22536: Display problem in Holds to Pull report
This patch modifies the display of several values in the holds to pull
report so that they can be displayed as lists instead of as chunks of
HTML generated in SQL.
This patch modifies the SQL in pendingreserves.pl so that values can be
formatted in the same way that holding branch is. The better long-term
solution is to remove SQL from pendingreserves.pl altogether, but this
is a quick fix.
This patch also makes a couple of minor markup changes to fix
validation.
To test, apply the patch and go to Circulation -> Holds to pull. To see
the changes the patch makes your holds to pull list should have titles
with multiple items at multiple branches, with call number, copy number,
and enumeration data. These values should all be displayed in bulleted
lists.
Signed-off-by: David Roberts <david.roberts at ptfs-europe.com>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b0e5790947df32383864466724a3e4838ee659bd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jan 9 07:06:25 2019 -0500
Bug 22076: Add missing whitespace on if statments
Rescued-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2153d851a094c6617551381899f8ec54d9e2fb0e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jan 9 07:02:30 2019 -0500
Bug 22076: Fix the same situation for lost items
Signed-off-by: Geeta Halley <ghalley at roundrocktexas.gov>
Rescued-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c7e48b0a1ad72b36445bc5d4202adb1b34bb8387
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jan 7 12:46:29 2019 -0500
Bug 22076: SIP checkin for withdrawn item returns ok in checkin response
If an item that is withdrawn is checked in via SIP2, Koha does not process the checkin, but still indicates the checkin succeeded via the ok flag in the checkin response message.
To recreate:
1 - Mark an item withdrawn
2 - Set up sip server:
https://wiki.koha-community.org/wiki/Koha_SIP2_server_setup
3 - Set 'BlockReturnOfWithdrawnItems' to block
4 - Use the sip_cli_emulator to checkin the withdrawn item
5 - There is no error in the checkin
Test Plan:
1) Mark an item withdrawn
2) Set BlockReturnOfWithdrawnItems to block
3) Use the sip cli emulator to checkin the withdrawn item
4) Note the response begins with 101
5) Apply this patch
6) Restart all the things ( including SIP server )
7) Repeat checkin with sip cli emulator
8) Note the checkin now beings with 100
Signed-off-by: Geeta Halley <ghalley at roundrocktexas.gov>
Rescued-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7ac1457ffc27cf6ec5a3a7bab6abc8a010e02b6a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 22 13:19:51 2019 +0000
Bug 22560: Forgotten password "token expired" page still shows boxes to reset password
This patch modifies the OPAC password recovery template so that the new
password entry form doesn't appear if the patron has followed an invalid
or expired link.
This patch also corrects the markup in the page title.
To test, apply the patch and follow the process for resetting a
forgotten password. When you follow the password recovery link, modify
the URL so that the "uniqueKey" parameter is different.
The page should show an error message. The password entry form should
not appear.
Check the page title in the browser's title bar. It should look correct.
https://bugs.koha-community.org/show_bug.cgi?id=22520
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 50be1c4006e0a1d7e3b537bd849bc77f7a6bb56f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 22 12:57:31 2019 +0000
Bug 22561: Forgotten password requirements hint doesn't list all rules for new passwords
This patch modifies a few templates in the OPAC so that all available
information on password requirements is displayed for each case where
the patron is setting a password:
- If the RequireStrongPassword system preference is set, a message
should appear listing strong password requirements and minimum
password length.
- If RequireStrongPassword is not set, the message should only ask for
a minimum password length.
To test, apply the patch and enable the PatronSelfRegistration and
OpacResetPassword preferences.
On the following pages, test with RequireStrongPassword both on and
off. The correct messages should appear.
- OPAC -> Forgot password. Follow the process to reset your password
until you reach the step where you are entering the new password.
- OPAC -> Register here. Check the password section of the registration
form.
- OPAC -> Log in -> Change your password.
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 3ef48c8708736e9d5b16e462e520302c007cb4c1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 20 11:26:40 2019 -0300
Bug 17746: (QA follow-up) Make set_password.pl generate a password if required
This patch makes the set_password.pl script generate the password if it
is not passed as an argument.
It also changes the behaviour of set_password.pl: it will now print the
userid and password (generated or not) to mimick the behaviour from
koha-reset-passwd.
The koha-reset-passwd gets simplified as it doesn't generate the random
password anymore, it passes the responsability to set_password.pl
To test:
- Follow the steps from the original platch
- Verify all behaves as expected
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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>
commit e2f6542e1ebbd15977b47c86d2a9ef55fa0c5e9b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Feb 4 15:09:34 2019 -0300
Bug 17746: Add misc/admin/set_password.pl script
This patch introduces a script that allows changing a patron's password.
The change overrides the defined password enforcement policy.
If multiple conditions are passed to match on the patron, they all need
to match. Otherwise an error message is printed.
Attributes to search the patron on:
- cardnumber
- patron_id (a.k.a. borrowernumber)
- userid
we usually know some of them, but if we specify more than one, they need
to match a patron, together.
To test:
1) Apply this patch
2) Have a known patron (i.e. you know the cardnumber, the borrowernumber
and the userid).
3) Run:
$ kshell
k$ perl misc/admin/set_password.pl --cardnumber <the_card_number> \
--password a_password
4) Verify you can login with the new password
5) Repeat 3) through 5) with --patron_id and --userid
=> SUCCESS: You can login in all cases
6) Try combining some or all the parameters
=> SUCCESS: It fails when it should, it succeeds when it should
7) Sign off :-D
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
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>
commit 0cd4ca289bd2e1bd11fdbd015225a909971ce213
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Feb 5 14:04:12 2019 -0300
Bug 17746: Make koha-reset-passwd user set_password.pl
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
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>
commit 28e7f1d4e7a114b04d6940463f47351466a638dd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 20 16:24:42 2019 +0000
Bug 22550: OPAC suggestion form doesn't require mandatory fields
Test plan:
1. OPAC->login->your purchase suggestions->New purchase suggestion
2. Click button "Submit your suggestion" directly without filling in any field.
Empty suggestion record was added succeffully.
3. Apply the patch.
4. Click button "Submit your suggestion" directly without filling in any field.
The required fields should be labeled in red.
(you can change the mandatory fields by preference 'OPACSuggestionMandatoryFields')
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Jogiraju,T. <rajujogi.t at gmail.com>
Signed-off-by: Jogiraju,T. <rajujogi.t at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 53b059afbb5731373a92a3ebaaceea4e1d656363
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Tue Mar 12 11:29:33 2019 +0200
Bug 22495: Restore Elasticsearch mapping for su-geo
Test plan:
1. Reset mappings
2. Run perl misc/search_tools/rebuild_elastic_search.pl -d -b -v
3. Do a search and verify that the Places facet works
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 65f35447e93008810cec3eba63a286b9940d5824
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Mon Dec 17 16:22:58 2018 +0200
Bug 21974: Make Elasticsearch connection settings configurable
Default settings are appended in get_elasticsearch_params so that there's a central place for them. Defaults can be overridden in koha-conf.xml.
Test plan:
1. Verify that searches still work with the patch applied.
2. Verify that search fails after adding the following under <elasticsearch> in koha-conf.xml:
<cxn_pool>Static</cxn_pool>
3. Verify that search fails after adding the following under <elasticsearch> in koha-conf.xml:
<cxn_pool>FOO</cxn_pool>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a993bd3843fdfcf3a7f2df916299b32d4601b879
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Mar 27 17:36:35 2019 +0000
Revert "Bug 22399: Improve responsive behavior of the basic marc editor"
This reverts commit b5a742c62f016969dabad9b786a7fe2d75cca760.
Style changes broke other features of rancor. Reverting to restore functionality
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 32 ++---
C4/SIP/ILS.pm | 17 ++-
C4/SIP/ILS/Transaction/Checkin.pm | 2 +
Koha/Patron.pm | 17 +++
Koha/Patron/Attribute.pm | 52 ++++++++
Koha/Patron/Attributes.pm | 32 +++++
Koha/SearchEngine/Elasticsearch.pm | 13 +-
admin/aqbudgetperiods.pl | 2 +-
admin/searchengine/elasticsearch/mappings.yaml | 19 +++
circ/circulation.pl | 8 --
circ/pendingreserves.pl | 12 +-
debian/scripts/koha-reset-passwd | 61 ++++++---
koha-tmpl/intranet-tmpl/prog/css/addbiblio.css | 48 ++++++--
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 10 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 38 +++---
.../prog/en/modules/circ/pendingreserves.tt | 51 ++++++--
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/reports/borrowers_stats.tt | 3 +-
.../bootstrap/en/modules/opac-memberentry.tt | 8 +-
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 7 +-
.../bootstrap/en/modules/opac-password-recovery.tt | 12 +-
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
members/boraccount.pl | 9 --
members/files.pl | 9 --
members/housebound.pl | 10 --
members/mancredit.pl | 10 --
members/maninvoice.pl | 9 --
members/member-flags.pl | 9 --
members/member-password.pl | 9 --
members/memberentry.pl | 1 -
members/moremember.pl | 1 -
members/notices.pl | 9 --
members/pay.pl | 19 ---
members/paycollect.pl | 19 ---
members/purchase-suggestions.pl | 9 --
members/readingrec.pl | 9 --
members/routing-lists.pl | 9 --
members/statistics.pl | 9 --
misc/admin/set_password.pl | 129 ++++++++++++++++++++
reports/borrowers_stats.pl | 1 -
t/db_dependent/Budgets.t | 8 +-
t/db_dependent/Koha/Patron/Attributes.t | 64 +++++++++-
t/db_dependent/Koha/Patrons.t | 51 +++++++-
tools/viewlog.pl | 9 --
45 files changed, 572 insertions(+), 290 deletions(-)
create mode 100755 misc/admin/set_password.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list