[koha-commits] main Koha release repository branch master updated. v17.05.00-1018-gaa42697
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 1 17:19:48 CET 2017
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 aa4269777c5893a3f5ecdec65877c2cec88e3ba3 (commit)
via bc0012de2eda1b9f077459df757fd82ea07ca343 (commit)
via bdce98487884152549d5aee9e7fb684d54f82d06 (commit)
via 8c510e1a92a4ed76de69748bbda91a33b5edd3cf (commit)
via 7703723508195ca116e2ea7d766ff741149d2efc (commit)
via 411d0cf8ead451099704237549a899bb216aece3 (commit)
via 264f69651091350d588a2fa8f2ff05f006126096 (commit)
via 844dc871ffc0c664e22be6b14a99a3016580646d (commit)
via 1577937057cfeb11419e8c744bf5eaa22cbe5a16 (commit)
via e7835ff9780a011476f5cd2438205619f91508b1 (commit)
via 84020230ebee553bccf4bfd895719806a7d211f5 (commit)
via 63b7017bd36c80a80fb6e66edf8ee538e1bb38ed (commit)
via 888a97f15b3c1c6f89311c726793c6cab14850b4 (commit)
via 211dafc6505bbaa9bf6bbc4704937e4c7fed4fa2 (commit)
via f0e737f43a8eec253e81ad06a8be24730fcf61fd (commit)
via dfcb2b8071582a55e35c47926d4b5c1b8b2a9a59 (commit)
from 790150b31277e6ded86823add0385c5960a4876e (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 aa4269777c5893a3f5ecdec65877c2cec88e3ba3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 27 07:49:51 2017 +0200
Bug 17989: (QA follow-up) Replace bad dots in SuggestionEngine_ExplodedTerms.t
SuggestionEngine_ExplodedTerms.t uses paths like /../.. or /.. in order
to find a template in opac-tmpl.
Sub badtemplatecheck does not like these paths.
Using Cwd::abs_path to resolve the situation (rel2abs does not).
Test plan:
Run again t/db_dependent/SuggestionEngine_ExplodedTerms.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bc0012de2eda1b9f077459df757fd82ea07ca343
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jan 25 15:32:01 2017 +0100
Bug 17989: Final changes
[1] The template sco/printslip.tt is in the regular modules directory.
Should not be prefixed with a slash.
Test plan:
[1] Try to find another occurrence just like the one corrected in
sco/printslip.pl where an absolute path is passed to gettemplate or
get_template_and_user. I already tried several regex variations
while git grepping template_name, but you may still find one..
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: Removed the changes for svc/members/search. Not needed.
Commit message adjusted accordingly.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bdce98487884152549d5aee9e7fb684d54f82d06
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 26 13:14:13 2017 +0200
Bug 17989: Resolve "verbatim paragraph in NAME section" warning in C4::Templates
*** WARNING: Verbatim paragraph in NAME section at line 28 in file C4/Templates.pm
Test plan:
Run podchecker on C4::Templates and verify that the warning is resolved.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8c510e1a92a4ed76de69748bbda91a33b5edd3cf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jan 25 10:22:13 2017 +0100
Bug 17989: Include full path logic in _get_template_file
Similar to the full path test in sub themelanguage, this patch makes a
change in _get_template_file. This allows you to pass a template
outside the modules directory to get_template_and_user. (Note: the sub
badtemplatecheck already blocks bad paths.)
Especially, this would be helpful for plugins using templates. As can be
seen in Templates.pm, a change was made earlier to overwrite the filename
for a plugin in sub gettemplate. This exception can now be removed.
Also note the small change in Koha/Plugin/Base.pm; mbf_path is already
absolute and if we pass a full path, we do not need it. This allows use of
a regular Koha template or a shared template between plugins (as long as
badtemplatecheck allows the path).
What are the side-effects of this change?
[1] We should not pass absolute paths if we mean relative ones.
A follow-up patch deals with one occurrence in the codebase.
No regressions for regular use.
[2] Plugins can call get_template_and_user directly or go via get_template
in Koha/Plugin/Base (absolute paths don't go via mbf_path).
Note: replaced two single quotes in Auth.pm to show template name in test
description.
Test plan:
[1] Open some page on OPAC or staff client to trigger a template.
[2] Run t/db_dependent/Auth.t to verify not allowing some bad templates.
[3] Run t/db_dependent/Templates.t to verify an absolute path.
[4] Run t/db_dependent/Plugins.t to verify using templates in a plugin.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7703723508195ca116e2ea7d766ff741149d2efc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 30 09:24:22 2017 +0100
Bug 17989: Extend bad template check
The check is now extended by only allowing templates from the regular
Koha template directories and additional plugin directories as defined
in koha-conf.xml.
Note: In order to prevent an uninitialized warning on $theme from sub
themelanguage for a not-existing file, I added a trivial assignment. Will
get further attention in a follow-up.
Test plan:
[1] Run t/db_dependent/Auth.t
[2] Run t/db_dependent/Templates.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 411d0cf8ead451099704237549a899bb216aece3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 30 08:43:45 2017 +0100
Bug 17989: Centralize bad template check
The bad template check in get_template_and_user can be removed, since
this check has been added in gettemplate on bug 18010.
The check moves here to a new sub in C4::Templates. And will be extended
in a follow-up.
Removed unused variable $path in gettemplatefile.
Test plan:
[1] Run t/db_dependent/Auth.t (get_template_and_user bad calls).
[2] Run t/db_dependent/Templates.t (bad call to gettemplate).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 264f69651091350d588a2fa8f2ff05f006126096
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 31 13:25:13 2017 -0300
Bug 7143: Update 'Koha development team' list
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 844dc871ffc0c664e22be6b14a99a3016580646d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 31 13:09:47 2017 -0300
Bug 7143: Make about.pl knows about the new epoch column
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1577937057cfeb11419e8c744bf5eaa22cbe5a16
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 31 12:53:12 2017 -0300
Bug 7143: Add missing entries
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e7835ff9780a011476f5cd2438205619f91508b1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 31 11:19:09 2017 -0300
Bug 7143: Add a new "Epoch" column to the history.txt
To allow sort easily. It also fix a few typo and remove 1 duplicated line
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 84020230ebee553bccf4bfd895719806a7d211f5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 30 11:14:53 2017 -0300
Bug 19539: (follow-up) Fix column index shift in cirulation rules
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 63b7017bd36c80a80fb6e66edf8ee538e1bb38ed
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Oct 27 11:12:57 2017 -0300
Bug 19539: Fix column index shift in cirulation rules
This patch fixes an index shift introduced by bug 18857 when it introduced
a new column.
To test:
- On the Circulation and fine rules page
- Empty the value of 'Current on-site checkouts allowed' and save
- Notice 'Unlimited' shows on the saved rule.
- Click edit
=> FAIL: the 'Unlimited' string displays instead of the empty string on the editing row.
- Apply this patch
- Re-open the circ rules page
- Click edit
=> SUCCESS: An empty string fills the 'Unlimited' fields
- Sign off :-D
Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 888a97f15b3c1c6f89311c726793c6cab14850b4
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Oct 30 14:41:47 2017 +0000
Bug 19176: Fix how t::lib::Dates::compare handle timezone
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 211dafc6505bbaa9bf6bbc4704937e4c7fed4fa2
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Oct 23 22:29:24 2017 +0000
Bug 19176: followup - fix POD in t/lib/Dates.pm
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f0e737f43a8eec253e81ad06a8be24730fcf61fd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 23 11:38:58 2017 -0300
Bug 19176: Reduce the number of seconds to 5
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dfcb2b8071582a55e35c47926d4b5c1b8b2a9a59
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 25 17:56:52 2017 -0300
Bug 19176: Compare the number of seconds when comparing dates in tests
# Failed test 'borrowers.updated_on should have been set to now on creating'
# at t/db_dependent/Patrons.t line 74.
# got: '2017-08-10T20:53:03'
# expected: '2017-08-10T20:53:04'
# Looks like you failed 1 test of 17.
[20:53:15] t/db_dependent/Patrons.t .....................................
The plan here is to compare the number of seconds between two dates.
If < 60 the dates are consired as identicals.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 6 +-
C4/Templates.pm | 45 +-
Koha/Exceptions.pm | 4 +
Koha/Plugins/Base.pm | 7 +-
about.pl | 2 +-
docs/history.txt | 1872 ++++++++++----------
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 32 +-
.../prog/en/modules/admin/smart-rules.tt | 6 +-
opac/maintenance.pl | 2 +-
opac/sco/printslip.pl | 2 +-
t/Test/Dates.t | 29 +
t/db_dependent/Auth.t | 2 +-
t/db_dependent/Patrons.t | 7 +-
t/db_dependent/Plugins.t | 27 +-
t/db_dependent/SuggestionEngine_ExplodedTerms.t | 3 +-
t/db_dependent/Templates.t | 44 +-
t/db_dependent/Virtualshelves.t | 9 +-
t/lib/Dates.pm | 32 +
18 files changed, 1191 insertions(+), 940 deletions(-)
create mode 100644 t/Test/Dates.t
create mode 100644 t/lib/Dates.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list