[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.04-29-gc0422998f8
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 1 23:09:17 CEST 2020
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, 19.11.x has been updated
via c0422998f89daf82eb898ddb951d46df97a6f1e4 (commit)
via 5811331a5a07b84c39de7485fd2d21df7d45be34 (commit)
via 4516a3ead6577131cc8087527a6d0c42158597f8 (commit)
from c78e180c56691ed50472ec87b780135f78992868 (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 c0422998f89daf82eb898ddb951d46df97a6f1e4
Author: David Cook <dcook at prosentient.com.au>
Date: Mon Jan 13 17:05:17 2020 +1100
Bug 17464: Order deny,allow / Deny from all was deprecated in Apache 2.4 and is now a hard error
Patch change Apache access control from 2.2 to 2.4 directives.
Test plan:
0. Apply patch
1. Build Koha from source
2. Copy or symlink koha-dev/etc/koha-httpd.conf into your relevant
Apache directory.
3. Reload Apache
4. Note a lack of syntax errors regarding the "Order" directive
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 5811331a5a07b84c39de7485fd2d21df7d45be34
Author: Maryse Simard <maryse.simard at inlibro.com>
Date: Wed Aug 21 17:20:16 2019 -0400
Bug 23488: Line wrapping doesn't always respect word order in Patron card creator
When wrapping long lines of text, the line is divided by removing each
word from the end of the line and putting it in a new one until the line
is the right width. When the word to be removed appears multiple time
in the line, it is not the last occurrence that is removed.
This patch changes the regular expression used to remove the part of
the text that is wrapped to a new line, making sure it removes it at
the end of the text.
Test plan:
1. Go to Tools > Patron card creator
2. Have a card template and a card batch
-> If needs be, you can create them by using
New > Card template or New > Card batch
3. Create a layout and use one text field containing a long text with
at least one word which is repeated a minimum of 2 times
(preferably towrdds the end of the text, since it has to be picked
as one of the words to appear in the new line). You can use this:
one two three one two three one two three one two three
one two three one two three one two three one two three ...
4. Go to Manage > Card batches and export a batch
5. Choose the layout set up in 3.
6. Click the Export button and open the resulting pdf file
7. Notice all the repeated word have been grouped
-> For this example : all of the ones appear first, followed by
all the twos and only then the threes.
8. Apply patch
9. Repeat step 4 through 7
=> this time the order of the words has not changed!
Signed-off-by: Gabriel DeCarufel <gabriel at inlibro.com>
Signed-off-by: William Frazilien <william.frazilien at inlibro.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 4516a3ead6577131cc8087527a6d0c42158597f8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 28 16:48:37 2020 +0000
Bug 23753: Add missing humanMsg library to pages using background job JavaScript
The JavaScript used to process background uploads calls the humanMsg
library under some circumstances. There are several templates which use
background-job-progressbar.js which don't include the humanMsg assets.
This patch corrects those templates.
Note: upload-images.tt has been modified to remove the inclusion of
background-job-progressbar.js because it was unused.
To test, apply the patch and test the following processes which include
background job processing:
- Batch item modification -- the background job is triggered when you
submit your changes
- Batch record modification -- the background job is triggered when you
submit your changes
- Stage MARC for import -- the background job is triggered when you
click the "Sage for import" button after uploading a file
- Staged MARC management -- the background job is triggered when you
click "Import this batch into the catalog"
In each case the process should complete correctly. If you would like to
test the error message handling provided by the humanMsg library you can
deliberately introduce an error into the JavaScript. After applying the
patch you can modify js/background-job-progressbar.js to alter line 63
from:
url: f.action,
...to:
url: f.action + "foo",
Perform the same tests and confirm that you see an error message. Don't
forget to undo your changes to background-job-progressbar.js before
signing off.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Patroncards/Patroncard.pm | 2 +-
etc/koha-httpd.conf | 6 ++----
koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 3 ++-
.../prog/en/modules/tools/batch_record_modification.tt | 2 ++
koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 2 ++
koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 1 -
7 files changed, 10 insertions(+), 8 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list