[koha-commits] main Koha release repository branch master updated. v19.11.00-933-g104b87c9a0
Git repo owner
gitmaster at git.koha-community.org
Mon Mar 2 11:15:44 CET 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, master has been updated
via 104b87c9a093e5a2aa859f9d2d63ed2b8556bcaa (commit)
via b4d56d3fd823974e39c064b4f59a17a85a0194bc (commit)
via 266bcd554bd298ee4a1f09696af6e20c8fa3f548 (commit)
via 8dc15ceffd7c9b3a720210537dff098a7b0c83d8 (commit)
via 00d70a9bd839f6153b9b86c50c5e51dbe7d82b40 (commit)
via b5b8a7daeb54a4793f5725aa15927781f52fe106 (commit)
via 9060ca36c08f6f5ff2b5790ae163cd43758a7fd8 (commit)
via ee12fb2247f913195a31d790c164f28952178bf7 (commit)
via afd5ee31baeabdee9b01e2b9f5ae379de1ffb8db (commit)
via d5a1a82a9bb3aa8c693192d469ee0186aef7c7c4 (commit)
via 2fe29c657468f240ec5c781edfaf811261c774cd (commit)
via 813da7f2433d182a7616407da42beef7f2c1f881 (commit)
via cab8dd8cf116fcc23b487c493d7bac147c82b9fe (commit)
via d352145c65d7c8609d8694031902dafdb23a14f2 (commit)
via 886dd6b3be3ce94eb28742b2b10cffe7eaf64c8b (commit)
via 729200ae57b81966b3ae5e312eef8e75123f85b9 (commit)
via c44bfe12087cda33b351b157014e818db2e4613a (commit)
via bd88b10c6fbf5b6ee19ff71dc8c9777de26d5eb6 (commit)
via 7b63d55ddc0d821b7311fcad714ff46ff750f08a (commit)
via 5bbf80989a5b8d6a1222b0e95c242b9457dfb024 (commit)
from 1e7819f742cdea8b14342db4da188b48cc0cc4b9 (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 104b87c9a093e5a2aa859f9d2d63ed2b8556bcaa
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Mar 2 09:45:47 2020 +0000
Bug 22273: DBRev 19.12.00.031
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b4d56d3fd823974e39c064b4f59a17a85a0194bc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 18 13:49:59 2019 +0000
Bug 22273: Modify Koha::ArticleRequest->store to fill created_on
For a new record, store should fill created_on.
The database will always update the timestamp updated_on.
Since open also calls SUPER::store, we do not need to call it twice.
Test plan:
[1] Run t/db_dependent/ArticleRequests.t
[2] In the interface, add two article requests. Change the status of one
to PROCESSING. Check created_on and updated_on in the article_requests
table. The changed request should have updated_on > created_on.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
[1] Tests pass
ok 12 - New article request has created_on date set
ok 13 - New article request has updated_on date set
[2] Work as described.
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 266bcd554bd298ee4a1f09696af6e20c8fa3f548
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 18 14:35:50 2019 +0000
Bug 22273: Database revision for table article_requests
Column created_on should not be updated. It is filled once by the
store method of Koha::ArticleRequest.
Column updated_on should be a timestamp, updated by the database.
Note: Although higher versions of MySQL and MariaDB support two timestamps
(NOT NULL) in one table, I kept on the safe side by allowing NULL on the
created_on column.
@RM: Don't forget to run DBIx update.
Test plan:
Run new install or upgrade.
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>
commit 8dc15ceffd7c9b3a720210537dff098a7b0c83d8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 18 13:39:57 2019 +0000
Bug 22273: Replace typo opan by opac in POD
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>
commit 00d70a9bd839f6153b9b86c50c5e51dbe7d82b40
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>
commit b5b8a7daeb54a4793f5725aa15927781f52fe106
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>
commit 9060ca36c08f6f5ff2b5790ae163cd43758a7fd8
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>
commit ee12fb2247f913195a31d790c164f28952178bf7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 28 15:00:40 2020 +0000
Bug 23536: Remove obsolete category markup from patron entry
This patch removes some obsolete markup from the patron entry template
(memberentrygen.tt). The old markup was necessary in a long-gone version
of Koha where it was possible to add patrons using built-in categories
instead of defining your own.
To test, apply the patch and test the process of adding or editing
patrons. You should see the patron category displayed correctly in the
page title, breadcrumbs, and main heading.
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>
commit afd5ee31baeabdee9b01e2b9f5ae379de1ffb8db
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 28 14:53:53 2020 +0000
Bug 23534: Use patron-title.inc on patron entry page
There are a few instances where we can simplify the patron entry
template by using the patron-title include file instead of outputting
patron name variables one by one. This patch does so in the page title,
page breadcrumbs, and page heading.
To test, apply the patch and edit a patron record. The page title,
breadcrumbs, and main heading should all look correct.
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>
commit d5a1a82a9bb3aa8c693192d469ee0186aef7c7c4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Feb 24 17:01:19 2020 +0000
Bug 24725: (QA follow-up) Add missing spaces between elements on claims tab
There was a missing space between the title and the barcode.
Also added a space between title and author.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2fe29c657468f240ec5c781edfaf811261c774cd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 25 14:40:06 2020 +0100
Bug 24725: Remove ES template literals in checkouts.js
From Julian on bug 24661 comment 6:
"""
It looks like xgettext does not like ES6 template literals.
https://savannah.gnu.org/bugs/?50920
From what I understand, support for template literals was added in gettext 0.20 (still not packaged in debian) but is still buggy in latest released version 0.20.1 and a fix is present in master.
"""
We should not use backticks ` in .js file, it breaks xgettext.
To replicate:
kohadev-koha at e1f3025cca60:/kohadevbox/koha/misc/translator$ perl translate update es-ES
koha-tmpl/intranet-tmpl/prog/js/checkouts.js:569: warning: unterminated string
koha-tmpl/intranet-tmpl/prog/js/checkouts.js:858: warning: unterminated string
koha-tmpl/intranet-tmpl/prog/js/checkouts.js:904: warning: unterminated string
koha-tmpl/intranet-tmpl/prog/js/checkouts.js:911: warning: unterminated string
koha-tmpl/intranet-tmpl/prog/js/checkouts.js:1095: warning: RegExp literal terminated too early
/usr/bin/msgmerge: error while opening "/kohadevbox/koha/misc/translator/po/es-ES-messages-js.po" for reading: No such file or directory
(last error 'No such file or directory' is not related to this).
Test plan:
Make sure nothing is broken on the claims table
Confirm that the errors do not longer appear on `perl translate update LANG`
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 813da7f2433d182a7616407da42beef7f2c1f881
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 25 14:17:27 2020 +0100
Bug 24727: (bug 14697 follow-up) Replace link on title to bib detail page
903 let title = `<a
class="return-claim-title strong"
href="/cgi-bin/koha/circ/request-rcticle.pl?biblionumber=[%
rc.checkout.item.biblionumber | html %]">
At first it seems like a typo:
request-rcticle.pl vs request-acticle.pl
But actually it does not make sense to link to request-article, we want
(I think) to link to the bibliographic record detail page.
Test plan:
- Have something in the claim table (cf bug 14697)
- Click on the title of the bibliographic record
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cab8dd8cf116fcc23b487c493d7bac147c82b9fe
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Feb 26 20:09:52 2020 +0100
Bug 24734: Fix paths in LangInstaller.pm for JS files
Use intrahtdocs and opachtdocs in order to get the correct paths for all
kind of installations
Test plan:
1. With a dev install, run ./translator create/update/install xx-XX and
verify that there is no error message
2. With a standard install, run ./translator create/update/install xx-XX
and verify that there is no error message
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested for dev/single/standard installs, no errors,
just a (normal) warn from po2json.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d352145c65d7c8609d8694031902dafdb23a14f2
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Feb 29 10:49:46 2020 +0100
Bug 24736: (QA follow-up) Change tooltip wording
Suggesting a change of the tooltip wording to read:
There are no enrollments for this club yet
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 886dd6b3be3ce94eb28742b2b10cffe7eaf64c8b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 26 17:46:49 2020 +0100
Bug 24736: Disable "Enrollments" link if nobody enrolled to the club yet
The link is disabled but it's possible to click and access the page
anyway.
Test plan:
- Create a new club template
- Create a new club
- Click the Actions > Enrollments link
=> Without this patch you can access the page
=> With this patch applied you cannot, and a tooltip explains why (feel
free to suggest another wording)
- Add a new patron to this club (from /cgi-bin/koha/opac-user.pl#opac-user-clubs)
- Notice that the action link is not enabled and click takes you to the
list of enrollments
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 729200ae57b81966b3ae5e312eef8e75123f85b9
Author: Andrew Fuerste-Henry <andrew at Andrews-MacBook-Pro.local>
Date: Thu Feb 27 14:09:02 2020 -0600
Bug 24747: Corrects on-screen instructions in branch transfer limits
To test:
1- go to cgi-bin/koha/admin/branch_transfer_limits.pl
2- see wording "Check the boxes for the libraries you accept to checkin items from"
3- apply patch
4- see wording "Check the boxes for the libraries you allow your items to be transferred to"
To verify new wording accuractely describes behavior:
1- Set UseBranchTransferLimits set to Enforce using itemtype
2- Confirm circ rules allow holds
3- Confirm hold policy by item type allows holds
4- Confirm all branches are valid pickup locations in branch setup
5- In Branch Transfer Limits, set dropdown to Branch A, select itemtype Book, disable all transfers so Branch A does not accept books from any other branch
6- Find a patron from Branch A
7- Find a book from Branch B
8- On the intranet, successfully place hold on item for patron for pickup at branch A
9- Cancel hold
10- Log into opac as patron
11- Successfully place hold on item for pickup at Branch A
12- Cancel hold
13- In Branch Transfer Limits, set dropdown to Branch A, select itemtype Book, ENABLE all transfers so Branch A DOES accept books from any other branch
14- In Branch Transfer Limits, set dropdown to Branch B, select itemtype Book, disable all transfers so Branch B does not accept books from any other branch
15- On the intranet, try to place a hold on item for patron, confirm Branch B is your only pickup option
16- On the OPAC, log in as patron, try to place a hold on item, confirm Branch B is your only pickup option
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c44bfe12087cda33b351b157014e818db2e4613a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 27 02:06:34 2020 +0000
Bug 24746: Duplicate id in opacheader markup
This patch removes '<div id="opacheader">' from masthead.inc
because the same markup is generated by koha_news_block.
To reproduce the bug, make sure there is an opacheader news block
defined. Add this to the OPACUserCSS system preference:
View the main page of the OPAC. You should see two blue borders around
the opacheader content.
Apply the patch and reload the OPAC page. There should now be only one
blue border.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested whith OPACUserCSS -> #opacheader { border: 1px solid blue; padding: 1px; }
don't know the intended value but works :)
Work as described following test plan, no errors.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bd88b10c6fbf5b6ee19ff71dc8c9777de26d5eb6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Mar 2 09:27:54 2020 +0000
Bug 13327: Compiled CSS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7b63d55ddc0d821b7311fcad714ff46ff750f08a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 19 13:47:11 2020 +0000
Bug 13327: (follow-up) Correct CSS and XSL errors
This patch adds back the CSS changes which seem to have been lost in a
rebase somewhere. The patch also corrects a bad copy/paste in the XSL
file which led to a 404 error.
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5bbf80989a5b8d6a1222b0e95c242b9457dfb024
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 12 11:38:57 2019 +0000
Bug 13327: OPACPopupAuthorsSearch doesn't work with XSLT views
This patch reimplements the OPACPopupAuthorsSearch feature so that it
will work in the XSLT view.
To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
- View the detail page for a bibliographic record in the OPAC.
Test under the following conditions:
- OPACPopupAuthorsSearch ENABLED, OPACXSLTDetailsDisplay "default"
- OPACPopupAuthorsSearch ENABLED, OPACXSLTDetailsDisplay empty
- OPACPopupAuthorsSearch DISABLED, OPACXSLTDetailsDisplay "default"
- OPACPopupAuthorsSearch DISABLED, OPACXSLTDetailsDisplay empty
In each of these cases, test the detail page's listing of additional
authors/contributors and subjects. Test records which have both multiple
contributors or subjects and which have only one author or subject.
When OPACPopupAuthorsSearch is turned on, verify that the author/subject
selection modal appears and that your selections are correctly combined
to build a search string.
Note that OPACPopupAuthorsSearch feature has a problem with terms
containing parentheses. The issue predates this patch.
Also note that the QA tools will give a false positive about Bootstrap
button styles. This rule only applies to the staff client.
Signed-off-by: Liz Rea <wizzyrea at gmail.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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Patroncards/Patroncard.pm | 2 +-
Koha.pm | 2 +-
Koha/ArticleRequest.pm | 17 +-
Koha/Schema/Result/ArticleRequest.pm | 16 +-
etc/koha-httpd.conf | 6 +-
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 9 +
.../intranet-tmpl/prog/en/includes/clubs-table.inc | 4 +-
.../en/modules/admin/branch_transfer_limits.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 39 +--
.../prog/en/modules/tools/batchMod-edit.tt | 3 +-
.../en/modules/tools/batch_record_modification.tt | 2 +
.../prog/en/modules/tools/manage-marc-import.tt | 2 +
.../prog/en/modules/tools/stage-marc-import.tt | 2 +-
.../prog/en/modules/tools/upload-images.tt | 1 -
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 87 ++++---
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 3 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 263 ++++++++-------------
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 23 +-
misc/translator/LangInstaller.pm | 4 +-
t/db_dependent/ArticleRequests.t | 5 +-
23 files changed, 205 insertions(+), 297 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list