[koha-commits] main Koha release repository branch master updated. v3.20.00-650-g6a5ca69
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 28 17:09:55 CEST 2015
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 6a5ca69bca091869773863b4436b78f3956589ec (commit)
via 72656f3aa3bbd4bbed89e98e235a16e8e597a298 (commit)
via e46aa8395b359c773961b1a705d4b9c7f9d3db01 (commit)
via 8c3fb9c3ae4729c67a057d5531eb7ae8eb9396c0 (commit)
via ecdfa41f8461abb4423e447730deb9b8256ca046 (commit)
via 0f56f2b7fcb5c0a92c4fa104eeb9b51a29d5b935 (commit)
via c34c8ee853c4ec6a457c5ae8f75729507e242207 (commit)
via 67fa231a74426197b4a78f7d7620be2edff08f31 (commit)
via 53dd856c66a2c2f77db5e04d8bdf4f34c583b638 (commit)
via 1b8f3194e9f616f46260c849eda5a9f6c717d5fa (commit)
via 2d69e143d8649aa569f673b37036c3a303b4ffdf (commit)
via 71a9b187d86bd5f7c3679d38b3919c9260c3feef (commit)
via d7d64c0718cfbb816e9677baecf722427060d3b5 (commit)
from e8182991804b591dc1730e46da343495af377d2f (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 6a5ca69bca091869773863b4436b78f3956589ec
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Mon Sep 28 12:09:40 2015 -0300
Bug 14368: (RM followup) DBIx update
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 72656f3aa3bbd4bbed89e98e235a16e8e597a298
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Mon Sep 28 12:08:09 2015 -0300
Bug 14368: DBRev 3.21.00.029
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit e46aa8395b359c773961b1a705d4b9c7f9d3db01
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Mon Sep 21 14:52:03 2015 +0200
Bug 14368: [Follow-up] Fix workflow
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 8c3fb9c3ae4729c67a057d5531eb7ae8eb9396c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 10:27:42 2015 +0100
Bug 14368: Add some missing tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit ecdfa41f8461abb4423e447730deb9b8256ca046
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Sep 16 16:13:21 2015 +0200
Bug 14368: [Follow-up] Add filter on borrower when displaying discharges history on borrower's page.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 0f56f2b7fcb5c0a92c4fa104eeb9b51a29d5b935
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Sep 16 14:54:13 2015 +0200
Bug 14368: [Follow-up] Fix tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit c34c8ee853c4ec6a457c5ae8f75729507e242207
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Tue Jun 9 14:35:07 2015 +0200
Bug 14368: Add discharges history.
Currently, once a user is discharged, lifting the discharge debarment does
not allow the user to ask for a discharge again.
This patch adds the ability for a user to be discharged several times and to
keep an history of the discharges.
Test plan:
- As a user, ask for a discharge.
- As a librarian, allow the discharge.
- Check that the requested and validated dates appear on the discharge panel of the borrower in the admin interface.
- Lift the discharge debarment of the user.
- Check that you can repeat these steps and that the new discharges are added in the discharge panel of the borrower in the admin interface.
Please note that you will need to run misc/devel/update_dbix_class_files.pl after the SQL update.
Adding a primary key to the discharges table was mandatory for DBIX::Class to be able to query with order_by.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 67fa231a74426197b4a78f7d7620be2edff08f31
Author: Winona Salesky <wsalesky at gmail.com>
Date: Tue Jun 9 10:18:05 2015 -0400
Bug 14054: 246 XSLT Improvements
Adds other title type based on ind2 value. ind2 overridden by $i value.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 53dd856c66a2c2f77db5e04d8bdf4f34c583b638
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 09:43:51 2015 +0100
Bug 14509: (follow-up) Reject invalid passwords
The members.js was not included in member-password.tt
And it cannot, there are specific code which cannot be used outside of
memberentry.tt
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 1b8f3194e9f616f46260c849eda5a9f6c717d5fa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 14 15:33:34 2015 +0100
Bug 14509: Reject invalid passwords
Bug 10177 rejects password with leading or trailing whitespaces, but
only on the member-password page.
It's not consistent to only do this check on 1 place.
This patch adds the check for the 2 other places: memberentry and at the
OPAC.
Test plan:
1/ Edit a patron and set a password with leading and/or trailing
whitespaces. You should not be allowed to do it (no server side check).
2/ Same at the OPAC ("Change you password" tab). Here there is a server
side check.
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 2d69e143d8649aa569f673b37036c3a303b4ffdf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 28 08:38:26 2015 +0200
Bug 14904: Resolve warning from tt_valid.t
Test tt_valid.t warns that opac-retrieve-file.tt has no id and class
attribute on the body tag.
This patch adds them to clear the warning.
Test plan:
Apply patch and run xt/tt_valid.t.
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 71a9b187d86bd5f7c3679d38b3919c9260c3feef
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 28 12:17:39 2015 +0200
Bug 14909: Warnings from search_utf8.t when empty idx= misses in base
The regex in this test looks like:
opac-search.pl\?idx=&q=%CE%91%CE%B8%CE%AE%CE%BD%CE%B1
The result it got was:
opac-search.pl?q=%CE%91%CE%B8%CE%AE%CE%BD%CE%B1
The empty idx should not be a reason to fail the test. I changed the
original regex to make the 'idx=&' part optional and added a base_unlike
test to verify that the base does not include a idx=\w+ anywhere.
Also corrected the typo Goog. Good!
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
All 66 tests now pass with me.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit d7d64c0718cfbb816e9677baecf722427060d3b5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 28 10:54:55 2015 +0200
Bug 14905: Search_utf8.t fails to upload a file
Running the test fails on test 7:
not ok 7 - upload succeeded
The changes on bug 14321 included a temp flag for script upload-file.pl.
Since this upload for stage-marc-import should be temporary, adding this
flag to line 131 resolves the problem.
Test plan:
Run the adjusted test.
NOTE: I still had some problems with this test. And will still be looking
to these errors (perhaps open a new report). But this fix should at least
fix the above-mentioned test.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Borrower/Discharge.pm | 35 +++++++++-
Koha/Schema/Result/Discharge.pm | 24 ++++++-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/updatedatabase.pl | 10 +++
koha-tmpl/intranet-tmpl/prog/en/js/members.js | 11 +++
.../prog/en/modules/members/discharge.tt | 22 ++++++
.../prog/en/modules/members/member-password.tt | 13 +++-
.../prog/en/modules/members/memberentrygen.tt | 1 +
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 42 ++++++++----
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 3 +
.../bootstrap/en/modules/opac-retrieve-file.tt | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 48 ++++++++-----
members/discharge.pl | 9 ++-
opac/opac-discharge.pl | 2 +-
opac/opac-passwd.pl | 8 ++-
t/db_dependent/Borrower_Discharge.t | 72 ++++++++++++++------
t/db_dependent/www/search_utf8.t | 14 ++--
18 files changed, 252 insertions(+), 68 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list