[koha-commits] main Koha release repository branch master updated. v19.11.00-506-gd12f50a2e5
Git repo owner
gitmaster at git.koha-community.org
Wed Jan 29 10:36:05 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 d12f50a2e57e8ce84b7761c154b82d42051b9c4a (commit)
via 54c821a9e8df8a0cbc0a74a83fe605cd27cd40ac (commit)
via 68c9273fa76cedf8de48d4284693b5058ca5fdbd (commit)
via 0cdd62600b85721f6f1704138fdf56b94ba15d52 (commit)
via 12b8c3ac1e01f5a9fbc9221dba9ad44d00c53083 (commit)
via ef4306cc02e2f15aa2466ae65d0b4f9a1fd70ad9 (commit)
via 07d2a419f36711b5dc9b26a081eafa6a96cfdce9 (commit)
from f1f1c2e9b12d8d7bbcf5d88ad739e098a6031aef (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 d12f50a2e57e8ce84b7761c154b82d42051b9c4a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 1 18:15:53 2019 +0000
Bug 23947: Phase out jquery.cookie.js: Authority merge
This patch updates the JavaScript which sets cookies during the
authority merge process so that it uses the new js-cookie library.
To test, apply the patch and perform a search in the authority module
which will return multiple results.
- Select "Merge" from the Actions menu next to any result.
- A message should appear at the top of the page: "Merging with
authority: <title>".
- Click "Cancel merge." The message should disappear.
- Select a record to merge again.
- Select another record.
- The page should redirect to the authority merge page.
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 54c821a9e8df8a0cbc0a74a83fe605cd27cd40ac
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 1 13:18:28 2019 +0000
Bug 23944: (follow-up) Update circulation to use new library
This patch updates the circulation page to use the new JavaScript Cookie
library for cookie management.
To test, apply the patch and open a patron record for checkout in the
staff client.
- Click "Search to hold" in the toolbar and perform a catalog search
which will return results.
- On the search results page, the toolbar at the top of the results
should include a split "Place hold" button. The button's menu should
include "Place hold for <patron>" and "Forget <patron>" options. Test
that these work correctly.
- In the table of search results each title should include a "Place
hold for <patron>" link.
- Go to the checkouts page for a patron with one or more checked-out
items.
- Check the "Always show checkouts immediately" checkbox.
- The patron's checkouts should load.
- Open another patron for checkout who has checked-out items.
- The table of checkouts should load automatically.
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 68c9273fa76cedf8de48d4284693b5058ca5fdbd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 1 13:00:03 2019 +0000
Bug 23944: Phase out use of jquery.cookie.js in favor of js.cookie.js
This patch adds a new JavaScript file to the staff client's global
JavaScript include file: js.cookie-2.2.1.min.js. This "plugin" will
replace jquery.cookie.js which is no longer maintained.
The "About" page in the staff client is updated to include this new
resource as well as adding previously-missing information about the old
plugin which will remain until all instances of its usage have been
removed.
To test, apply the patch and check the About page to confirm the correct
information is included.
No functionality change is introduced by this bug. The only other
observable change is the existence of the new files and the inclusion of
the minified version of the file in any staff client page.
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 0cdd62600b85721f6f1704138fdf56b94ba15d52
Author: David Roberts <david at koha-ptfs.co.uk>
Date: Fri Jan 24 02:15:46 2020 +0000
Bug 20847: Add more fields to the Batch Patron Modification tool
This patch adds streetnumber, address, address2, phone and mobile to the
Batch Patron Modify form, also moves Primary email to a more logical
place on the page
To test:
1) Install patch
2) Open Batch Patron Modification tool, and input a borrowernumber to
edit
3) Add some data into the streetnumber, address, address2, phone and
mobile fields and click Save
4) These fields in the user record should now contain your data
5) Test that running the tool again with the option to delete the data
clears the fields correctly
6) Repeat steps 1-5 with a file of user borrowernumbers
Signed-off-by: Daniel J <daniel.jones at cheshiresharedservices.gov.uk>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 12b8c3ac1e01f5a9fbc9221dba9ad44d00c53083
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 21 17:01:06 2019 +0000
Bug 23856: Split author and ISBN/ISSN out of citation in staged MARC record management
This patch modifies the way data is passed to the staged MARC record
management template, splitting author, ISBN, and ISSN out of the
"citation" variable and passing them separately.
The DataTables configuration for the staged MARC record management page
is modified so that those now-separate variables are conditionally
displayed.
Unrelated minor change: Added a class to the MARC preview modal so that
it displays wider.
To test, apply the patch and view the "Staged MARC management" page for
both batches of bibliographic records and batches of authority records.
In each case the title or authority heading should be displayed as a
link while author, ISBN, and ISSN (if any) should not.
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 ef4306cc02e2f15aa2466ae65d0b4f9a1fd70ad9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Oct 22 11:47:04 2019 +0000
Bug 23885: Move staff client search results JavaScript into separate file
This patch moves most of the JavaScript embedded in results.tt into a
separate file. The JavaScript that remains on the page is everything
which requires processing by Template Toolkit. This is limited to
variable definition.
To test, apply the patch and perform a catalog search in the staff
client. On the results page, test that JavaScript functionality has not
been affected:
- The search results toolbar should "float" as you scroll
- Select all and Clear all
- Default search term highlighting; Unhighlight and highlight controls
- Adding and removing one or more items from the cart
- Adding one or more items to a list
- Placing one or more holds my making selections and clicking "Place
hold"
- Browse selected records
- Z39.50 search (search form should be populated with your search
terms)
- "Show more" and "Show less" links in the facets sidebar
- Book cover image services: Amazon, Coce, local covers, etc.
- Open a patron record and click "Search to hold"
- Perform a search and select one or more results
- Test "Place hold" from the hold menu in the toolbar
- Test "Place hold for..." from the hold menu in the toolbar
- Test "Forget..." from the hold menu in the toolbar
- In Tools -> Patron clubs, locate a club with enrolled members
- From the "Actions" menu, select "Search to hold"
- Perform a search and select one or more results
- Test "Place hold" from the hold menu in the toolbar
- Test "Place hold for..." from the hold menu in the toolbar
- Test "Forget..." from the hold menu in the toolbar
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 07d2a419f36711b5dc9b26a081eafa6a96cfdce9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jan 7 13:03:18 2020 +0000
Bug 13121: Move search results "action" links ("Place hold," "Add tag," etc) into include file
This patch moves markup for controls repeated across several OPAC
templates into a single include: Place hold, Request article, Add tag,
Save to lists, and Add to cart.
To test, apply the patch and view the following OPAC pages:
- Search results
- Shelf contents view
- User tags list
On each of these pages all the controls should work correctly:
- Place hold
- Request art
- Add tag
- Save to lists
- Add to cart
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>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/lib/js-cookie/js.cookie-2.2.1.js | 163 ++++++++++
.../lib/js-cookie/js.cookie-2.2.1.min.js | 3 +
.../prog/en/includes/authorities_js.inc | 10 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 1 +
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +
.../prog/en/modules/catalogue/results.tt | 350 +++------------------
.../prog/en/modules/circ/circulation.tt | 6 +-
.../prog/en/modules/tools/manage-marc-import.tt | 17 +-
.../prog/en/modules/tools/modborrowers.tt | 28 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 +-
koha-tmpl/intranet-tmpl/prog/js/pages/results.js | 308 ++++++++++++++++++
.../bootstrap/en/includes/title-actions-menu.inc | 61 ++++
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 44 +--
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 50 +--
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +
opac/opac-shelves.pl | 13 +
opac/opac-tags.pl | 20 ++
tools/batch_records_ajax.pl | 9 +-
tools/modborrowers.pl | 44 ++-
20 files changed, 704 insertions(+), 436 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/js-cookie/js.cookie-2.2.1.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/js-cookie/js.cookie-2.2.1.min.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/pages/results.js
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list