[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.09-15-ga38a6ba
Git repo owner
gitmaster at git.koha-community.org
Wed Jun 28 00:13:05 CEST 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, 16.11.x has been updated
via a38a6ba178775cfbed8f0cc51e6c5c881864b8af (commit)
via 7df38cc175a468b2ff454b223b0ebaa82977b9e4 (commit)
via 0537ff3c863e8b62d175015c4446eea0856bc412 (commit)
via a0e9bc59db761200fbff00d659c4af4900364690 (commit)
via 53b9cb83b2e49dd77fe635ae86ca922db3d75839 (commit)
via 5bdd19301fa13e884dad9231c06445376e6c8010 (commit)
via 15da9aa0d05f907fd328830b8014c74f5ec022ef (commit)
via 9c787039b2887ee5fb3f08ded35746d4e4eecb18 (commit)
via 9cec7d146fbd397f4a942cb10bb6ef9563ece23e (commit)
via b5106f8f101a84ff63ede48d482b8498741a830b (commit)
via 928d21978eca503ddb86fc4b84964a56f25ae956 (commit)
via cc458c946e4b6ff947f179f6f3833d0e96dc8268 (commit)
via 5488ca09cece5e1eab441ce0a83252596b8cb4e2 (commit)
via 296a7c8377c88d4702650b815975a6f5aff31984 (commit)
via 9d558d580c2e8ef949bdb74c8108a0d6d7afe453 (commit)
from 52f376e1b90a873726f5cbd26505b319c57581ac (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 a38a6ba178775cfbed8f0cc51e6c5c881864b8af
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Jun 15 18:07:53 2017 -0400
Bug 18807: t/db_dependent/www/batch.t fails
get() does not take two parameters. fixed.
prove and run koha qa test tools
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit da10c3169b8cae71bf4a98b6585654a09704c323)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 15146ec2920caa464683e04798763cb2e3dac0e4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7df38cc175a468b2ff454b223b0ebaa82977b9e4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 14 16:56:13 2017 -0300
Bug 18807: Fix tests www/batch.t
Several things are wrong here:
1. It assumes that import_record_id is the biblionumber
=> Wrong, it is only true when the DB is empty and that the 2 AI equal 1
2. The encoding in the template is 'UTF-8', not 'utf8', it leaded to
"stage-marc-import.pl: marc21record.mrc: Unexpected charset UTF-8, expecting utf8"
3. We did not test that the biblio was correctly imported
Test plan:
Make sure the tests now pass.
For the www tests you need to set the following env vars:
KOHA_USER, KOHA_PASS, KOHA_INTRANET_URL and KOHA_OPAC_URL
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 768c5758a2bb34876528e64edbb9d651942668c9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 92fee49448f9bc68ad6884d5600bbba94caae547)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0537ff3c863e8b62d175015c4446eea0856bc412
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 14 15:53:18 2017 -0300
Bug 18806: Fix batch revert
Since bug 18242: When a biblio is deleted, a new transaction is created.
tools/manage-marc-import.pl use the AutoCommit flag, which does not
allow nested transaction.
AutoCommit must not be used.
Test plan:
Import a batch, then revert it.
The biblios must have been correctly deleted, they were not before this
patch
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 3db0401366b8e099ab2046d68cf20a9f754e1eae)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit eafd2e7299e3db30d0d84d084fa5e49de60fa748)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a0e9bc59db761200fbff00d659c4af4900364690
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Jun 6 08:09:19 2017 +0000
Bug 18703 - Followup, fix typo "statment"
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 4dd9236c6ebdfff33abcf97b6ea254ed1e63ffbe)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1c9092c94457e7ed58ce0ba45c466e0f41397e86)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 53b9cb83b2e49dd77fe635ae86ca922db3d75839
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 20:44:30 2017 +0200
Bug 18703 - Translatability: Resolve some remaining %%] problems for staff client in 6 Files
There are some more files that expose parts of tt diretives to translations, mostly due to
line breaks inside directives.
Files covered with this Bug:
koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
To test:
- Review code, verify that line breaks are removed
- Run QA tools
- Bonus test: Create a "language" aa-AA and verify that no fragments
containign %%] are picked for the 6 files
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 9fb5f8519f2937aa7db6b53d6501f09ada11db4f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit a704e04e9675e9597632b3e6f65cef6854744b97)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
changes to members-update.tt didn't apply to 16.11.x
commit 5bdd19301fa13e884dad9231c06445376e6c8010
Author: Marc Véron <veron at veron.ch>
Date: Tue May 30 16:08:32 2017 +0200
Bug 18699: Get rid of %%] in translation for edi_accounts.tt
Translation for edi_accounts.tt exposes:
[%% transport_types = [ 'FTP', 'SFTP', 'FILE' ] %%]
Translators should not be confronted with such code internals.
To test:
- Review code change (it removes line breaks)
- Bonus test: Create a new translatin for "language" aa-AA and
verify that the line no longer appears in aa-AA-staff-prog.po
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 3b64ebe2346de50d2fa3745d0febb935b5cc8b75)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 63239abdf119cbe21fe316bddc9ba6acc164f2c9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 15da9aa0d05f907fd328830b8014c74f5ec022ef
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 16 17:00:23 2017 -0300
Bug 18804: Add additional information to execute successfuly selenium tests
(cherry picked from commit 0f105285910d6a14b44d7cd789475a144552a627)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 8b0b8ca53221ab09917713f8d6bca534d5b92a34)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9c787039b2887ee5fb3f08ded35746d4e4eecb18
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 14 13:08:43 2017 -0300
Bug 18804: (bug 13501 follow-up) Fix add item form (select2)
Hard to say here, select2 adds so many elements that we need to ignore.
Here we just assume that input text with an id starting with
tag_952_subfield must be filled
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
(cherry picked from commit 8035a467f0b5d8441d4164bc183286d4f2593438)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d5f1aca783390beaf422847d3f01a3f632e37bfe)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9cec7d146fbd397f4a942cb10bb6ef9563ece23e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 14 13:08:20 2017 -0300
Bug 18804: (bugs 16400,11088 follow-up) Update the "save category" elt selector
With bug 11088 and bug 16400 the submit node switched from:
<input type="submit" name="save" onclick="return check_form_borrowers();" value="Save" />
to:
<button type="submit" name="save" onclick="return check_form_borrowers">
then finally to:
<button class="btn btn-small" id="saverecord" type="submit" name="save" onclick="return check_form_borrowers();">
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
(cherry picked from commit 08ab41aa9825e48f6321a90bf0bef09b572d4000)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit fe5c9a47b6851aa936e6bce0076e9105c3c53ff5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b5106f8f101a84ff63ede48d482b8498741a830b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 14 13:07:41 2017 -0300
Bug 18804: (bug 16286 follow-up) Update the "save category" elt selector
Bug 16286 replaced the submit node:
<input type="button" value="Save" onclick="Check(this.form);" />
with
<input type="submit" value="Save" />
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
(cherry picked from commit a88f540ec1a0f7e1f876f3811d0e44cb3ff3a612)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 06aca0844b1bbc42a759d0c9900be3ea7fef3a7d)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 928d21978eca503ddb86fc4b84964a56f25ae956
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 13 17:43:39 2017 -0300
Bug 18804: Skip selenium tests if Selenium::Remote::Driver is not installed
We do not want these tests to fail if the module is not installed.
This module is not in the dependencies of Koha and it is good as it.
A developper who wants to use it will know what to do.
It is part of RM duties to make sure these tests pass
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
(cherry picked from commit 943a3a5c3ab4df6337607e1e237ff4f059d23da4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit c3c5642bb87eb30e40681ef1894e5342148083e8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cc458c946e4b6ff947f179f6f3833d0e96dc8268
Author: Marc Véron <veron at veron.ch>
Date: Sun Jun 4 19:55:08 2017 +0200
Bug 11235: Names for reports and dictionary are cut off when quotes are used
To reproduce for saved reports:
- Go to Home > Reports > Guided reports wizard
- Create a report with double quotes in it's name, e.g. 'My "double quoted" report'
- Go to "Saved reports", locate in the list the new report (name is correct here,
is correct in database as well)
- From the selection button at the right choose "Edit"
- Result: Content of edit field for the report name is truncated (displays only: 'My')
To reproduce for Reports dictionary:
- Go to Home > Reports > Guided reports wizard
- Create a new definition, give it the name 'The "double quoted" definition' and enter
a text with double quotes for "Description"
- Save
- Verify that in the list of definitions both name and descriptions are truncated
(in database as well)
To test:
- Apply patch
- Verify that issues described above can no longer be reproduced
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit f4c965781d82e9537015b695cc15677cd06d72cd)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d6eb92b44f85a82db4dc063bd369b449f17cd7a5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5488ca09cece5e1eab441ce0a83252596b8cb4e2
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Oct 12 12:38:16 2016 +0200
Bug 13452: Fix for plack
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit a44f202fdb9c933e0b5ac88656e2c8f74e498023)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit dafd66b7a6cbabea3af905a3f78064109424d032)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 296a7c8377c88d4702650b815975a6f5aff31984
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Oct 2 11:31:10 2015 +0200
Bug 13452: Fix obvious issues in issues_avg_stats.pl
- Remove joins with issuingrules which are not needed
- Fix the SQL query so that $weight is now the value of COUNT(*) instead
of a timestamp
- QA fix: '$column eq $itype' instead of '$column =~ $itype' (same for
$line)
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 25d28e7c8100c1993f8794e39ed135781de04a47)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 99e3ef75544dadf2544977ae37fecb32f1384496)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9d558d580c2e8ef949bdb74c8108a0d6d7afe453
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Jun 9 01:04:07 2015 +0200
Bug 13452: 'Average loan time' report to obey item-level_itypes preference
Fixes the 'Average loan time' report so that the system
preference setting item-level_itypes is taken into account.
Before the patch, the report was always using the biblio
level itemtype. With the patch, it will depend on the pref
setting.
To test:
- Run various reports, compare results with both
possible pref settings
- Try limiting your search in various ways, especially
on a specific itemtype
- Make sure you switch checkboxes in testing,
using itemtype as the row or as the column
Notes:
- Filtering on a specific itemtype on master was not working
if the itemtype was chosen as column. The patch should fix that.
- Fixes headings and breadcrumbs so that the name of the report
is the same as on the reports start page
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit d0bf036c1828bbbd37a022f8449e217e8e269475)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9b8023044a979cc24c92493431e9e9d33c52c6a6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
.../en/includes/authorities-search-results.inc | 28 +--
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 3 +-
.../prog/en/includes/search_indexes.inc | 14 +-
.../prog/en/modules/admin/edi_accounts.tt | 5 +-
.../prog/en/modules/catalogue/issuehistory.tt | 6 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 9 +-
.../prog/en/modules/reports/dictionary.tt | 74 +++---
.../en/modules/reports/guided_reports_start.tt | 4 +-
.../prog/en/modules/reports/issues_avg_stats.tt | 4 +-
reports/issues_avg_stats.pl | 45 ++--
t/db_dependent/selenium/basic_workflow.t | 237 +++++++++++---------
t/db_dependent/www/batch.t | 21 +-
tools/manage-marc-import.pl | 54 +++--
13 files changed, 263 insertions(+), 241 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list