[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.02-47-g6da6f86
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 16 03:18:49 CET 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.11.x has been updated
via 6da6f8663b6d3e961a8e6001c8b3569ee7d54b96 (commit)
via c02b4b3eee68c1ddad7fdc1c6bd822db08e86830 (commit)
via 7f563f35f1f96ec96aa24b184a0dee4e89fcb234 (commit)
via 7193249931e15b75894823b9d26c3e80ead50cda (commit)
via 41802813a57c1733603cea2b6264ffd3ffddfca4 (commit)
via 19550c1cd99f07e2aa36d5641b0fda3829d6bc2e (commit)
via 31727730297037013f7ad65db971f15cdead26f8 (commit)
via 002ec257b0a3ded0742d7834b889a915a7328dec (commit)
via aa78aab317945c58fa88aded20a173bb68c372f3 (commit)
via f2c3d7aedfbb4028595a4ed8e8128f1d25b3eae0 (commit)
via eb119a7b07d99a8ec4b6d3d146ab0f6a3e914d6a (commit)
via 756c95477d2a16843abbd3858d776e37e28b4e90 (commit)
via 06f5e5f8adb08dab50c05062d127a3c2b15b944e (commit)
via 9a83b8d6f1fc59fa95ad27dedcd0b9bc669dc9b1 (commit)
via e74eda0193ae1b02ddd07627e5547e0448a32c03 (commit)
via 04d6f406ffc52cf60768fe38530aebf8c03add03 (commit)
via 5abb08859152c7af509a4c719d2b2ee2f2bf20fd (commit)
via f9fa8227367d65600eca4d2dbf5e2d8c09370b81 (commit)
via 1aebb1d476a1ae252758c2e89c9dbb668a60f092 (commit)
via ef7f119b1e0c0f5403239213e9ff0f450c923acf (commit)
via b658d25c053c0d47c70d694bcb25522cd3680b48 (commit)
via fc53d0d98209baa62629b9817595994c67e00854 (commit)
via 08772bdfd05d868d8e4b740786fd81f8e5369db0 (commit)
via 5cb0da7a56353988182cebfa0d16b22a4daebbfa (commit)
from deb7d1717736e00b0dbb3a45d9b41d6259d0d6ce (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 6da6f8663b6d3e961a8e6001c8b3569ee7d54b96
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Fri Feb 9 08:35:18 2018 +0200
Bug 20166: Untranslatable course reserves delete prompt
Having a Template Toolkit statements inside the javascript
translation function _() prevents it from being picked for
translation.
The only example of such is the course reserve delete prompt.
Move the TT statement outside the string.
Test plan:
1) Update and install language xx-YY. Check that the msgids
"Are you sure you want to delete this course? There is %s attached item."
and
"Are you sure you want to delete this course? There are %s attached items."
do not exist in the xx-YY-staff-prog.po
2) Check the translated file
intranet-tmpl/prog/fi-FI/modules/course_reserves/course-details.tt
It should have two prompt texts above in English
3) Install patch
4) Update the language. Check that the msgids show up in
xx-YY-staff-prog.po, translate them, and install the language.
5) Repeat 2, the prompts should now show up in the correct language.
6) Enable UsecourseReserves
7) Go to Home -> Course reserves
8) Create a new course, and add reserves to it
9) See the course details. Click on Delete course, the prompt
should be correctly translated
10) Remove all but one of the reserves from the course
11) Repeat 9
To see if there are other such TT statements:
rgrep -E '\b_\("[^"]*\[%' koha-tmpl/
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c02b4b3eee68c1ddad7fdc1c6bd822db08e86830
Author: Indranil Das Gupta (L2C2 Technologies) <indradg at l2c2.co.in>
Date: Sun Jan 21 23:59:35 2018 +0530
Bug 20054: Remove attribute "text/css" for <style> element in OPAC
Conformance rules for HTML5 is generating warnings for <style> element
with type="text/css" attribute when the OPAC page is checked
with W3C Validator.
Test plan
=========
1/ Click the "Tag cloud" link on the OPAC. Paste the URL to your OPAC
page (if it is hosted) to W3C Validator and watch the warning about
type attribute "text/css".
2/ Apply patch and re-submit the page to the Validator. The warning
will be gone.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: maksim <maksim at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7f563f35f1f96ec96aa24b184a0dee4e89fcb234
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 9 14:49:21 2018 -0300
Bug 19928: Mock delimiter pref in tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7193249931e15b75894823b9d26c3e80ead50cda
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 4 14:16:42 2018 +0000
Bug 10032: (follow-up) Move title attribute to button container
This patch modifies the "Close basket" button markup so that the title
attribute on a disabled button is added to the button wrapper <div>
instead of the <a> tag. This allows the title attribute tooltip to
appear when the cursor is hovered over the button.
To test, follow the original patch's test plan and confirm that when the
"Close basket" button is disabled, hovering the mouse over the button
triggers the title attribute tooltip.
Signed-off-by: Charlotte Cordwell <charlotte.cordwell123 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 41802813a57c1733603cea2b6264ffd3ffddfca4
Author: Jon Knight <J.P.Knight at lboro.ac.uk>
Date: Tue Dec 12 17:50:36 2017 +0000
Bug 10032: Improve GUI when uncertain price prevents closing the basket
Added disabled "Close this basket" button when uncertain
prices are present.
Note that whilst this has a "title" attribute, there is no tooltip
shown because JQueryUI disabled buttons don't get DOM events.
https://bugs.koha-community.org/show_bug.cgi?id=10032
Signed-off-by: Charlotte Cordwell <charlotte.cordwell123 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 19550c1cd99f07e2aa36d5641b0fda3829d6bc2e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 7 17:42:09 2018 +0000
Bug 20156: Display a markup for the current language in header menu
This patch replaces Glyphicon markup with Font Awesome markup so that a
check mark appears next to the currently-selected language in the staff
client header's language menu.
Also changed in this patch: Some classes have been removed because they
are not used in staff client CSS.
To test you must have multiple languages installed and enabled in the
staff client.
- Set the StaffLangSelectorMode system preference to "top" or "both top
and footer"
- Confirm that the currently-select language in the langauge menu has a
check mark next to it.
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 31727730297037013f7ad65db971f15cdead26f8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Feb 5 10:28:37 2018 -0300
Bug 20134: Remove /api/v1/app.pl from the generated URLs
This patch removes the /api/v1/app.pl prefix from generated baseUrl.
It has the consequence of hardcoding / as the base path for the API.
This is ok because we don't currently support mounting Koha pieces in
different than hardcoded paths (/cgi-bin/koha?), but certainly worth
mentioning because this will need to depend on a syspref or config entry
when someone chages this behviour.
To test:
- On master, point your browser to:
http://kohadev.mydnsname.org:8080/api/v1/
=> FAIL: basePath looks like /api/v1/app.pl/api/v1
- Apply this patch
- Restart memcached and plack:
$ restart_all
or
$ sudo systemctl restart memcached && sudo systemctl restart
koha-common
- Reload http://kohadev.mydnsname.org:8080/api/v1/
=> SUCCESS: basePath is /api/v1
- Sign off :-D
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 002ec257b0a3ded0742d7834b889a915a7328dec
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Wed Jan 10 16:07:36 2018 +0100
Bug 19928: Acquisitions' CSV exports now honors syspref "delimiter"
Bonus fixes:
- Basketgroup: there was an unnecessary space.
" RRP tax excluded" replaced by "RRP tax excluded"
- Late orders:
- leading spaces before every line
- surrounding spaces for [% orders.size %]
Other changes:
- quoted "Total orders in late" to no worry about additional spaces
- Late orders: additional spaces which shouldn't be a problem because
all the fields are enclosed by quotes.
Test plan:
1. Set syspref "delimiter" to "#'s"
2. Change the language e.g. FR-fr
3. Create a vendor with minimal info
4. Create a basket with two items
5. Go to the basket. URL should be
/cgi-bin/koha/acqui/basket.pl?basketno=XXXXX
6. Close this basket
7. "Export as CSV"
8. You should see that the file contains commas "," This is the bug.
Leave the file open for future comparison to ensure that there are
no regressions.
9. Create a basket group with two baskets
(tick the close this basket group check box)
10. Go to the "Closed" tab to see your basket group
11. "Export as CSV"
12. You should see that the file contains commas "," This is the bug.
Leave the file open for future comparison to ensure that there are
no regressions.
13. Go to /cgi-bin/koha/acqui/lateorders.pl
14. Tick two orders. Of the same vendor, otherwise Koha won't let you tick
orders of different vendors.
15. "Export as CSV"
16. You should see that the file contains commas "," This is the bug.
Leave the file open for future comparison to ensure that there are
no regressions.
17. Apply this patch
18. Translation stuff
1. cd misc/translator
2. perl translate update YOUR_LANG
3. manually edit the po file, remove the fuzzy tags.
And translate the string. You can just copy the original and
replace some parts by gibberish.
4. perl translate install YOUR_LANG
19. Re-export the same CSVs and compare with the original version to check that
- delimiter syspref is honored
- the headers are translatable
- there is no whitespace regression (additional newlines or spaces)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aa78aab317945c58fa88aded20a173bb68c372f3
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Fri Feb 2 09:45:42 2018 +0200
Bug 20124: Make "Save configuration" translatable on "did you mean?" config
When saving the "Did you mean?" setting, a popup with the
message "Successfully saved configuration" is shown, but
it cannot be translated. Make it translatable.
Test plan:
1) Go to Home -> Administration -> Did you mean?
2) Change the settings, click on "Save configuration"
3) Popup with "Successfully saved configuration"
4) Apply patch, update po-files, etc.
5) Check that the msgid "Successfully saved configuration"
is in fi-FI-staff-prog.po, and translate the message
6) install the fi-FI language
7) Change your UI language to finnish
8) Repeat 1, 2, 3. You should now see the same popup
message translated.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f2c3d7aedfbb4028595a4ed8e8128f1d25b3eae0
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Wed Jan 31 11:11:56 2018 +0200
Bug 20110: Adding same user multiple times to same budget
In javascript, using indexOf to test if a number exists in an array
of strings doesn't work, and makes it possible to add the same user
multiple times into the same budget fund.
Make borrowernumber into string and compare that instead.
Test plan:
1) Go to Home -> Administration -> Budgets -> Funds -> Add Fund
2) Add a user to the fund
3) Try to add the same user again to the same fund. No error.
4) Apply patch
5) Do 1, 2, and 3 again. You should now get an error message
saying the user is already in the list.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
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>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit eb119a7b07d99a8ec4b6d3d146ab0f6a3e914d6a
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Wed Jan 31 08:51:30 2018 +0200
Bug 20109: Make "Remove" translatable when adding a fund
When a user has been added to the fund, the link to "Remove" that user
is not translatable.
Test plan:
1) Install language xx-YY
2) Go to Home -> Administration -> Budgets -> Funds -> Add Fund
3) Add a user to the fund
4) Notice how the "Remove" link after the user's name is not translated
5) Apply patch
6) Look in xx-YY-staff-prog.po, and if needed, translate the msgid
"Remove"
7) Update and reinstall the language
8) Do 2 and 3 again. The "Remove" link should now be translated.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
https://bugs.koha-community.org/show_bug.cgi?id=10209
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 756c95477d2a16843abbd3858d776e37e28b4e90
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Mon Jan 29 16:09:24 2018 +0100
Bug 20098: Inventory tool: CVS export: fix itemlost column
It was mapped with "lost" instead of "itemlost".
== Test plan ==
1. Have a lost item
2. Go to staff:/cgi-bin/koha/tools/inventory.pl
3. Tick "Optional filters" → "items.itemlost" →
"name of Authorized values for the lost state"
4. Tick "Export to CSV file"
5. Submit
6. Open the CSV
7. Check that the lost item is in the list
8. You should observe that the "Lost status" column is empty for all items
This is the problem
9. Apply this patch
10. Click submit to re-export the CSV
11. Open the CSV
12. Check that the lost item is in the list
13. You should observe that the "Lost status" column now filled with the
expected values.
14. Smile because it works! :D
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Maksim Sen <maksim 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>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 06f5e5f8adb08dab50c05062d127a3c2b15b944e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 22 13:04:33 2018 +0100
Bug 20060: Resolve uninitialized warn from Koha::Template::Plugin::Branches
The warn comes from undefined C4::Context->userenv->{branch}.
Can be triggered by calling mainpage.pl when being logged out in staff.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
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>
commit 9a83b8d6f1fc59fa95ad27dedcd0b9bc669dc9b1
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jan 30 18:22:42 2018 +0000
Bug 12932: Check the Perl version even if all modules installed
The description in comment #0 is quite true, because the
scope of the $checkmodule variable is local to just the
module checking. If we change the scope, we can include the
perl check as part of the new scope, and thus properly set
its value.
As Debian Jessie, Stretch and Ubuntu Xenial all have good
versions of Perl by default, the easiest way to test this
is to:
- make sure to have some optional modules not installed.
- change the system preference 'Version' to one just under
the current version in your SQL client.
- modify the version check line to 5.030000
- restart_all and try going to the staff client.
-- This should not inform you that your perl version is bad.
- git reset hard back to origin/master
- apply the patch
- modify the version check line to 5.030000
- change the system preference 'Version' to one just under
the current version in your SQL client.
- restart_all and try going to the staff client.
-- This should trigger the patch, and you should
be informed your perl version is bad.
- git reset hard back to origin/master
- apply the patch
- run koha qa test tools
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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>
commit e74eda0193ae1b02ddd07627e5547e0448a32c03
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 5 09:56:42 2018 -0300
Bug 11827: (follow-up) Use double quote instead of simple-quote
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 04d6f406ffc52cf60768fe38530aebf8c03add03
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Thu Jan 25 13:04:09 2018 +0200
Bug 11827: Make "Cancel Rating" translatable in jQuery rating plugin
- Make the "Cancel rating" text translatable (and change
capitalization to conform to Koha coding guidelines)
- Improve the two other messages to use formatted strings
instead of concatenation.
- Use the exact same text for the "your rating" text, so it
only appears once in the po-file.
Test plan:
1. See that the "Cancel rating" -text doesn't appear in
po/xx-YY-opac-bootstrap.po
2. Note how there's two versions of the your rating -text
("your rating: %s, " and "your rating:") in the po-file
3. Apply patch
4. Update the xx-YY translation
5. Check the po-file. It should now contain the "Cancel rating"
and a single "your rating: %s, "
6. Translate those texts, and update & install the language.
7. Go to the OPAC detail page of a biblio, and check the
rating texts.
8. Hovering over the rating minus -sign should show the translated
"Cancel rating"
9. Check that the text after the stars is correct with and without
your rating
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5abb08859152c7af509a4c719d2b2ee2f2bf20fd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jan 18 15:40:15 2018 +0100
Bug 20031: CGI param in list context warn in guided_reports.pl
Resolve warn:
CGI::param called in list context from package CGI::Compile::ROOT::usr_share_koha_shadowclone_reports_guided_reports_2epl line 794, this can lead to vulnerabilities. [NOTE: line number from older Koha version.]
Test plan:
Looking at this change should convince you already. Another look at this
routine in C4/Output.pm would be bonus.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f9fa8227367d65600eca4d2dbf5e2d8c09370b81
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Dec 1 15:51:16 2017 +0000
Bug 19730: (follow-up bug 17196) Use biblio_metadata.timestamp in export_records.pl
Since bug 17196, biblioitems.timestamp is not always updated after a
change in the MARC record.
Filtering should be based on biblio_metadata.timestamp instead.
REVISED TEST PLAN
-----------------
0. Do not apply patch
1. Find a biblio record, remember the biblionumber for step 3
2. Edit the record, modify a field (e.g. 003, 015$q) that is
not mapped to a DB column, so biblio_metadata.timestamp will
be modified but not biblioitems.timestamp
3. In MySQL with the koha database selected:
> select timestamp from biblio where biblionumber=###;
> select timestamp from biblio_metadata where biblionumber=###;
-- you'll need to change the ###'s based on the biblionumber
you remembered in step 1.
-- the two timestamps will differ.
-- Remember the timestamp of biblio_metadata for step 4.
4. Run this command:
$ sudo koha-shell -c bash kohadev
$ export DATE="YYYY-MM-DD HH:mm:SS"
-- use the timestamp remembered in step 3.
5. Run this command:
$ ./misc/export_records.pl --date="$DATE"
$ ls -la koha.mrc
-- the file should be 0 bytes.
6. Run this command:
$ exit
$ git bz apply 19730
$ restart_all
$ sudo koha-shell -c bash kohadev
$ export DATE="YYYY-MM-DD HH:mm:SS"
-- use the timestamp remembered in step 3.
7. Run this command:
$ ./misc/export_records.pl --date="$DATE"
$ ls -la koha.mrc
-- the file should be a lot more than 0 bytes.
8. Run this command:
$ /home/vagrant/qa-test-tools/koha-qa.pl -v 2 -c 1
-- this should pass.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1aebb1d476a1ae252758c2e89c9dbb668a60f092
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 2 12:06:00 2018 +0100
Bug 20126: Add simple test for ModBiblioMarc
Just to confirm that we see record length and base address in a record
that has been passed through ModBiblioMarc.
Test plan:
Run the test.
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>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ef7f119b1e0c0f5403239213e9ff0f450c923acf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 2 11:32:49 2018 +0100
Bug 20126: (follow-up bug 10455) Restore MARC field length calculation in ModBiblioMarc
Trivial fix. Problem raised by bug 10455.
Test plan:
[1] Create or edit biblio record.
[2] Save and check leader field lengths in MARC view.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b658d25c053c0d47c70d694bcb25522cd3680b48
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jan 19 19:41:35 2018 +0000
Bug 20051: Invalid markup in staff client's header.inc
This patch corrects markup errors in header.inc which introduced by
Bug 19851. For id attributes on <span>s have been replaced with classes,
eliminating an HTML validator error about duplicate ids.
Minor unrelated change: Updated an element's id with a more descriptive
name.
Test plan the same as Bug 19851's:
- Log in to the staff client and confirm that the appearance of the
menu bar at the top of the screen looks correct at various browser
widths.
- Confirm that the logged-in user menu label and help link expand and
collapse according to browser width.
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Fix for QA: Corrected ID reference in circ/offline.tt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fc53d0d98209baa62629b9817595994c67e00854
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Dec 5 10:23:45 2017 -0500
Bug 19750: Overdues without a fine rule add warnings to log
When running fines.pl, any overdue items that have no corresponding circulation rule will generate the following warning:
Use of uninitialized value $amount in numeric gt (>) at /usr/share/koha/bin/cronjobs/fines.pl line 133.
Test Plan:
1) Create a single circ rule
2) Backdate a checkout so it is overdue
3) Delete the circ rule
4) Run fines.pl, note the warning
5) Apply this patch
6) Run fines.pl, note the warning is gone
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 08772bdfd05d868d8e4b740786fd81f8e5369db0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jan 30 14:34:10 2018 +0000
Bug 18497: (follow-up) Chomp newlines in BLOCK
To test:
Run report
Validate results page at: https://validator.w3.org/
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5cb0da7a56353988182cebfa0d16b22a4daebbfa
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 3 13:13:40 2018 +0000
Bug 18497: Use report id to retrieve saved SQL instead of passing param
This patch takes some of the code when executing report and moves it to
a sub to be reused when downloading
To test:
1 - Run some very long report (see comment #1)
2 - Try to download, erk!
3 - Apply patch
4 - Run report, results hould not have changed
5 - Try to download, success!
6 - Ensure reports work as before
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 2 +
Koha/REST/V1.pm | 5 +++
Koha/Template/Plugin/Branches.pm | 2 +-
installer/install.pl | 3 +-
.../prog/en/includes/csv_headers/acqui/basket.tt | 5 ++-
.../en/includes/csv_headers/acqui/basketgroup.tt | 5 ++-
.../en/includes/csv_headers/acqui/lateorders.tt | 5 ++-
.../intranet-tmpl/prog/en/includes/header.inc | 12 ++---
.../prog/en/includes/langmenu-staff-top.inc | 8 ++--
.../prog/en/includes/reports-toolbar.inc | 10 +++--
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 3 ++
.../prog/en/modules/acqui/csv/basket.tt | 19 +++++++-
.../prog/en/modules/acqui/csv/basketgroup.tt | 32 +++++++++++++-
.../prog/en/modules/acqui/csv/lateorders.tt | 18 +++++++-
.../prog/en/modules/admin/aqbudgets.tt | 4 +-
.../prog/en/modules/admin/didyoumean.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +-
.../en/modules/course_reserves/course-details.tt | 4 +-
.../bootstrap/en/includes/doc-head-close.inc | 4 +-
.../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 5 ++-
.../en/modules/opac-full-serial-issues.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 2 +-
.../bootstrap/en/modules/opac-imageviewer.tt | 2 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +-
.../bootstrap/en/modules/opac-topissues.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/help.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +-
misc/cronjobs/fines.pl | 2 +-
misc/export_records.pl | 12 ++---
reports/guided_reports.pl | 46 ++++++++++++--------
t/db_dependent/Acquisition/GetBasketAsCSV.t | 2 +
t/db_dependent/Biblio/{Isbd.t => ModBiblioMarc.t} | 38 ++++++++--------
tools/inventory.pl | 2 +-
37 files changed, 186 insertions(+), 92 deletions(-)
copy t/db_dependent/Biblio/{Isbd.t => ModBiblioMarc.t} (50%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list