[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.11-20-gf54db74
Git repo owner
gitmaster at git.koha-community.org
Tue May 22 13:23:02 CEST 2018
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, 17.05.x has been updated
via f54db7492dc703b306239279833a2036ba021e7f (commit)
via 96115837e576005a635b625628bc070ba05c617c (commit)
via 85ae8fdd03bdde0590e551e46a325462d1956fe6 (commit)
via a2ea5b9f10bc4009284c51f8a3c6ba7316a2f9cf (commit)
via 4276a5fdc216e877130dbf5b1d46f1cf2e2f166a (commit)
via 3a803fe5319fb29edfbe54c20be52f8fc4a34161 (commit)
via 29aad70ac4454aafe4047b60ef9740da2450aaca (commit)
via 2e0d9f41bbac71c8c7fdce5b77c8bb89e13db368 (commit)
via cb94e7d737459c0b88eeb05b545bfb9e39f2d031 (commit)
via 6068daab0eef9ff2bad8cb03586de53f0a8846cb (commit)
via 64fd0e65c3f44ac7faa93b9de2a8c85611eb6ec6 (commit)
via 4180999aa58ab2530b377ba11567aff6832c766b (commit)
via 493587da4ea96f1678afbadbaf3c04d2c206fbd0 (commit)
via b8cb916045df882a59aee18101792cef4cebc396 (commit)
via 5fba0ba12398c774cbf923ee0a11bfb8b85b1f2b (commit)
via bbd93258932202850b6cf9dd1e6a6a338e2b980c (commit)
from 8314711a0e1dec71dda27f7b40be4d95944bd924 (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 f54db7492dc703b306239279833a2036ba021e7f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 7 13:15:34 2018 -0300
Bug 20721: (bug 19403 follow-up) Prevent Circulation.t to fail randomly
If items.restricted == 1, CanBookBeIssued will not returned what we are
testing.
The easiest and global fix is to define a default value at TestBuilder
package level
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e93241a7174930c52c6f03560027cd527492148d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 96115837e576005a635b625628bc070ba05c617c
Author: Claire Gravely <claire.gravely at bsz-bw.de>
Date: Tue Apr 10 12:46:11 2018 +0000
Bug 20552: Fix HTML tag for search facets
The tags for home library and holding library in the 'refine your
search' list should be h5.
This patch changes the html tag for the availability, holding library and home library
facets.
To test:
- Search for an item in the OPAC where the relevant facet appears
- Use 'Inspect element' to check the tag
- Apply patch
- Confirm the facet now has the h5 tag
- Confirm spacing is improved
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8d5e9750afbf7d73d02d8db19cae428bfd397d59)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 85ae8fdd03bdde0590e551e46a325462d1956fe6
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Apr 6 14:59:28 2018 +0000
Bug 20122: Explicitly set path to fix emptying cart functionality
This is caused by bib_list not being deleted.
The path was not explicitly set.
This patch adds path=/ explicitly to ensure it
does get deleted.
TEST PLAN
---------
1) search for 'the' in OPAC
2) add several items to cart.
3) look at your cart.
4) empty and close the cart, select all->remove
-- either way window closes and it looks empty.
5) refresh the page
-- cart comes back.
-- in chromium inspecting the page, specifically
the "Application" area, bib_list is shown as
a cookie still.
6) apply patch
7) restart_all and empty cache forcing JS reload
8) repeat steps 1-5
-- this time cart stays empty.
-- and the bib_list cookie is gone
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com> using firefox 59.0.2
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 16c6ff1e3cb30f3aa4d2e23301b942eaf5a63d4c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a2ea5b9f10bc4009284c51f8a3c6ba7316a2f9cf
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date: Mon Jul 18 16:31:20 2016 -0600
Bug 19267: Rancor - Warn before leaving page if record modified
To test:
1 - Open the advanced editor
2 - Make some changes to a record
3 - Click on 'Patrons' or leave the page in some way
4 - Note there is no warning and changes are not saved
5 - Apply patch
6 - Open the advanced editor
7 - Make some changes
8 - Leave the page
9 - Note you get a warning of unsaved changes and can stay on the page
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5a6e7a6ffbab8e42e706486b9e75abe782a696b8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4276a5fdc216e877130dbf5b1d46f1cf2e2f166a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 6 15:35:50 2017 -0300
Bug 19578: Remove MARC punctuation in notices (TT syntax)
Jenkins fails (run 287) on a test in t/db_dependent/Letters/TemplateToolkit.t:
With the historical syntax:
# Your request for an article from tQYRS (c3Av58O0P5xkkIGu) has been canceled for the following reason:
With the TT syntax:
# Your request for an article from tQYRS_ (c3Av58O0P5xkkIGu) has been canceled for the following reason:
The last character of the biblio's title has been removed because it's a punctuation character.
It comes from: C4::Letters::_parseletter
893 $val =~ s/\p{P}$// if $val && $table=~/biblio/;
The same replacement is done for patron's attributes too.
Test plan:
- Confirm that the new tests pass. That should be enough to confirm this change make sense.
Test plan (manual):
- Create a biblio with a title ending with a punctuation (like "with_punctuation_"), or any other fields of biblio/biblioitem
- Generate a notice which will display this field (CHECKIN for instance)
Use the historical syntax and the TT syntax, both should display the title without the punctuation character at the end
CHECKIN historical:
The following items have been checked in:
----
<<biblio.title>>
----
CHECKIN TT syntax:
The following items have been checked in:
----
[% biblio.title %]
----
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 f5be2d525f7540a4833c14759bdc0de2ba5657db)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3a803fe5319fb29edfbe54c20be52f8fc4a34161
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 23 10:58:27 2018 +0000
Bug 20282: Match course reserve on holdingbranch
To test:
1 - Add a course (Course Reserves)
2 - Add an item to the course
3 - Ensure to change the holding branch for the course reserve
4 - Modify the course item
5 - Note the dropdwn for holding branch is unset
6 - Apply patch
7 - Modify the course item
8 - Dropdown should be correctly populated
Signed-off-by: Maksim Sen <maksim.sen at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 03b31bfc625484c9219935a50a5d0d3cf017b5e6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 29aad70ac4454aafe4047b60ef9740da2450aaca
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Mon Mar 12 07:15:12 2018 -0400
Bug 20369: Analytics search is broken with QueryAutoTruncate set to 'only if * is added'
Test Plan:
1) Enable EasyAnalytics
2) Disable QueryAutoTruncate
3) Create an analytic record, add some host items to it
4) Browser to the analytics tab for the record
5) Click the link in the 'used in' column of the table
6) No search results
7) Apply this patch
8) Reload the page, now you get the analytic record!
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 14b70dc91006c16beb48d40fe23fad27ed206f02)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 2e0d9f41bbac71c8c7fdce5b77c8bb89e13db368
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 26 12:22:15 2018 -0300
Bug 20462: Ensure batch item deletion will not delete the same item twice
This has been done on bug 9509 when barcodes are scaned, but not when using a text file.
Test plan (stolen from Barton on the bug report):
1) Create a text file containing duplicate barcodes
Here's a quick way to do that, substitute INSTANCE for the instance name of your test server:
sudo koha-mysql INSTANCE <<< "select barcode from items where barcode is not null limit 3" | sed '1d;p' > /tmp/dup_barcodes.txt
2) Go to Home › Tools › Batch item deletion
3) Click 'Choose File', select the file you created in step 1.
4) Click 'Continue'
5) Note that duplicate items appear in the list of items to batch delete
6) Check 'Delete records if no items remain'
7) This will trigger a software error
Note that entering the barcodes via the 'scan items one by one' text box removes duplicates in the list, so this only causes problems when uploading a file.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1f4baf31bb19c615f43771efa3fac7e2333d3622)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit cb94e7d737459c0b88eeb05b545bfb9e39f2d031
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 2 14:30:23 2018 -0300
Bug 20318: Add class 'required' to the label
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1982b1ad11703c815ceda2d9de79af62cda5263e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6068daab0eef9ff2bad8cb03586de53f0a8846cb
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Wed Mar 14 14:28:28 2018 +0000
Bug 20318: Merge invoices can lead to an merged invoice without Invoice number
When you want to merge invoices you have a page with a non editable
field 'Invoice number:' it shows the content of the first invoice to be
merged.
But if you validate by clicking the 'merge' button you arrive on the
next page which says that 'Invoice has been modified' and if you quit
this page without saving you have now a merged invoice without Invoice
number.
This tiny patch just prevents this issue to occur.
Test plan :
1° go to the acqui/invoices.pl page and search invoices to merge.
You must have at least 2 invoices on the same vendor
2° check boxes to select invoices to merge and click on 'merge selected
invoices' button
3° next page you see the non editable field 'Invoice number:'
4° click on the 'merge' button
5° next page you see 'Invoice has been modified'
6° leave this page i.e click on the left link 'Invoices'
7° search invoices you'll see the merged invoice without invoice number.
Apply the patch, replay the steps 1 to 3
4° on this page you can enter your invoice number and click on the
'merge' button.
If you leave this field empty and click merge, a message informs you
that it is required and you can not merge.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
(cherry picked from commit 3838dd83753a94adb32ab1b6facee7e700e20066)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 64fd0e65c3f44ac7faa93b9de2a8c85611eb6ec6
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri Mar 30 07:08:30 2018 -0400
Bug 18474: (QA follow-up) Remove useless else in template
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 a444807b57bfc0317b23d1a62e08bcbb15d39bc8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4180999aa58ab2530b377ba11567aff6832c766b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 21 15:59:24 2017 -0300
Bug 18474: Restore multiple holds when patron is searched for
We lost the ability to place multiple holds when we are searching for
patrons. The multi_holds parameter is lost and not handled correctly in
the template.
Test plan:
- Make sure you can place multiple holds for a patron you will search for
- Same for simple hold
TODO the multiple holds view should not be displayed if only 1 record
has been selected from the search result.
Signed-off-by: claude brayer <claude.brayer at cea.fr>
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 dc008b90cd50b80c78520de6379c61e534efce75)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 493587da4ea96f1678afbadbaf3c04d2c206fbd0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 30 13:14:46 2018 -0300
Bug 20503: Prevent Borrower_PrevCheckout.t to fail randomly
category_type must be != "X"
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
t/db_dependent/Patron/Borrower_PrevCheckout.t
(cherry picked from commit 082e4e257123d2f192008e531657ebb63adaef21)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b8cb916045df882a59aee18101792cef4cebc396
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Wed Mar 28 21:19:52 2018 +0000
Bug 20490: Correct bug number typo in comment in Circulation.t
NOTE: Confirmed that the typo of 17641 was part of bug 17941.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 6852c592f7f81b3d76b1ccfd38264bcd9cc75a61)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 5fba0ba12398c774cbf923ee0a11bfb8b85b1f2b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 20 21:35:47 2017 -0300
Bug 19673: Allow to set patron attributes to 0 with batch patron modification
This patch will have to be tested deeply to make sure it will not
introduce regression!
The idea is to display an empty option in the patron attributes select
and ignore it. That way we can deal with false values 0 and "" which
were skipped before.
Test plan:
Add several patron attributes
Use the batch patron modification tool to add/update/remove them
Play with empty "" and 0 values, as well as other values
Modify several attributes in a row
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
(cherry picked from commit 16dfb0309b778725fdb76cadee9943a0344285ed)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit bbd93258932202850b6cf9dd1e6a6a338e2b980c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 26 13:13:58 2018 -0300
Bug 20455: Fix sort patrons by date expired
We may need to apply this change for all other occurrences in our
codebase.
Test plan:
- Make sure sample patron data is loaded and you have a patron without a
date expired defined
- Make an empty search for all patrons or another search that gives you
a good amount of results
- Try to sort on the date expired column
=> Without this patch you get
Odd number of elements in anonymous hash
at /home/vagrant/kohaclone/C4/Utils/DataTables/Members.pm line 189.
output_pref is called with 'dateonly' (ref SCALAR), not a DateTime
object
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 09eaaaebcd8e02dbb3d026304d6227bbdc146cca)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 25 +++++++++++-
C4/Search.pm | 2 +-
C4/Utils/DataTables/Members.pm | 2 +-
.../Template/Plugin/Remove_MARC_punctuation.pm | 16 ++++----
.../prog/en/includes/cateditor-ui.inc | 7 ++++
.../en/includes/circ-patron-search-results.inc | 13 ++++--
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +-
.../prog/en/modules/acqui/invoices.tt | 8 ++--
.../en/modules/course_reserves/add_items-step2.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 5 +++
.../prog/en/modules/tools/modborrowers.tt | 21 +++++++---
.../bootstrap/en/includes/opac-facets.inc | 6 +--
koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 4 +-
reserve/request.pl | 11 ++---
t/db_dependent/Circulation.t | 22 +---------
t/db_dependent/Letters/TemplateToolkit.t | 42 +++++++++++++++++++-
t/db_dependent/Patron/Borrower_PrevCheckout.t | 3 +-
t/lib/TestBuilder.pm | 4 ++
tools/batchMod.pl | 1 +
tools/modborrowers.pl | 3 --
20 files changed, 137 insertions(+), 62 deletions(-)
copy t/Message.t => Koha/Template/Plugin/Remove_MARC_punctuation.pm (73%)
mode change 100755 => 100644
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list