[koha-commits] main Koha release repository branch master updated. v17.11.00-621-gfd70cdc
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 16 17:09:33 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, master has been updated
via fd70cdcc31021457285c68633a50499bf4b6bfe6 (commit)
via e01b3be15a6b2ad9b0f02598d84fe466e31e719e (commit)
via 04005f2ea12c270f2895738eb434e5292218b789 (commit)
via 2f90cd2be0affbdd2e2bc0c2223bfcf0cf65a13a (commit)
via 3672df52265d4c3caf6aef84b9f3e3b9f01f47d6 (commit)
from 8d30669458f671913d56596cd0461d8ab2a7c440 (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 fd70cdcc31021457285c68633a50499bf4b6bfe6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 16 12:58:34 2018 -0300
Bug 12904: Add KOHA_VERSION to few more .css
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e01b3be15a6b2ad9b0f02598d84fe466e31e719e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 14 14:12:00 2018 +0000
Bug 20193: Path to Greybox CSS broken after Bug 12904
Bug 12904 changed the way CSS and JS assets should be linked, but the
Greybox CSS path wasn't changed in the process. This patch adds the
required VERSION template variable to greybox.inc.
To test, apply the patch and test usage of Greybox in the staff client.
For instance:
- Go to Tools -> Labels -> Manage -> Label batches
- Select a batch for export and click the 'Export selected' button
- A Greybox modal should be triggered, and the export process should
proceed correctly.
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>
commit 04005f2ea12c270f2895738eb434e5292218b789
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 16 12:12:00 2018 -0300
Bug 20191: Use find with unique key combination
To prevent unexpected issues later.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2f90cd2be0affbdd2e2bc0c2223bfcf0cf65a13a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Feb 15 14:14:18 2018 -0300
Bug 20191: Make OAI/Server.t tests use timestamps from the DB
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3672df52265d4c3caf6aef84b9f3e3b9f01f47d6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 15 19:43:39 2018 +0000
Bug 20221: Fix for JavaScript error during checkout patron search
This patch fixes a bug caused by the changes in Bug 19641. JavaScript
embedded in circ-patron-search-results.inc executes before jQuery is
loaded.
This patch adds a separate javascript file which can be included both in
circulation.tt and request.tt since both use the same include.
To test, apply the patch and submit a patron name in the check out form.
On the page of search results, clicking a table row should work the same
as clicking the patron name link.
Perform the same test during the hold process: Locate and place a hold
on a title. In the patron search form, submit a patron name and test the
behavior of the search results screen.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
.../prog/en/includes/circ-patron-search-results.inc | 12 ------------
koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 2 +-
.../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +-
.../intranet-tmpl/prog/en/modules/admin/library_groups.tt | 2 +-
.../prog/en/modules/admin/usage_statistics.tt | 2 +-
.../prog/en/modules/authorities/authorities.tt | 2 +-
.../prog/en/modules/catalogue/issuehistory.tt | 2 +-
.../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +-
.../intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +-
.../intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 8 ++++----
.../intranet-tmpl/prog/en/modules/circ/circulation.tt | 1 +
.../prog/en/modules/circ/on-site_checkouts.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 1 +
.../intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 2 +-
.../intranet-tmpl/prog/js/circ-patron-search-results.js | 11 +++++++++++
koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc | 2 +-
t/db_dependent/OAI/Server.t | 12 ++++++++----
20 files changed, 39 insertions(+), 34 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list