[koha-commits] main Koha release repository branch master updated. v18.05.00-1185-g98d9df5
Git repo owner
gitmaster at git.koha-community.org
Sat Oct 27 16:37:55 CEST 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 98d9df517c43654eb3e6011f49694e52f25da96f (commit)
via 769fe38642b5d5ec99866aaacd911047ec799023 (commit)
via 36c09b6e616d96b210c21ff7512ca1679ef4bdfc (commit)
via c2bb1c2c06698abfd68f6893358a259e87dfa2b8 (commit)
via ba116a578b3115be1888bb23bc637b165f818fca (commit)
via 2953c6c6cde6dfdbc33248cd98178508d465eeec (commit)
via 45f90d9b6dd07aed6f853b18a5ce86d93c9d6a48 (commit)
via 13c1b6f123d7b9fd294704740903959b8e9e5154 (commit)
via 4a70f3a1ca4ce5c33c7efe17ca38d90d3cfbbdf7 (commit)
via 6f8fe7e22a59cef7bd1804440cbd7ceaaddf25b7 (commit)
via 6fd74beeababe6741c5d551f8753eee122e9962b (commit)
via 36d46cf9972ca906cae0d29cc2cdd2d5b5545316 (commit)
via 593b43f9b694a86e4509960b7b3942056b52e7cb (commit)
via 4d8ac89c0e082f2764d708b991764783d38987e3 (commit)
via 98b0a683c4507cc1a96db2a2216d205a8fb76cc2 (commit)
via 678e022bbbf039cbafcd55ad3ccd767ee3749544 (commit)
via 2460eb0597b699eb8c4afc19c727091fca1f4200 (commit)
via cf5835fc5286c7e087da2eeec06cf0417a2502d3 (commit)
from a05c1cb9a60ea40a6b2716a16136ca92488a979f (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 98d9df517c43654eb3e6011f49694e52f25da96f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 3 17:06:54 2018 +0000
Bug 21435: Update two-column templates with Bootstrap grid: Tools part 3
This patch modifies several tools templates to use the
Bootstrap grid instead of YUI.
This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Tools -> MARC modification templates
- View and edit templates
- Tools -> Batch patron modification
- Test each step of the process
- Tools -> Overdue notice/status triggers
- Tools -> Upload patron images
- Test each step of the upload process
- Tools -> Quote editor
-> Quote uploader
- Import quotes
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 769fe38642b5d5ec99866aaacd911047ec799023
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Oct 12 14:23:49 2018 +0000
Bug 21434: (follow-up) Switch two-column templates to Bootstrap grid: Tools part 2
This follow-up corrects CSS which was dependent on YUI-specific markup
context.
To test, apply the patch, regenerate the staff client CSS, go to Tools
-> Calendar.
- Click any date on the calendar
- In the entry form the checkbox and radio button options should be
styled correctly.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 36c09b6e616d96b210c21ff7512ca1679ef4bdfc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 3 16:48:34 2018 +0000
Bug 21434: Update two-column templates with Bootstrap grid: Tools part 2
This patch modifies several tools templates to use the
Bootstrap grid instead of YUI.
This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Tools -> Export data
- Tools -> Calendar
- Tools -> Import patrons
- Tools -> Inventory
- Tools -> Staged MARC management
- View batches and batch details
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c2bb1c2c06698abfd68f6893358a259e87dfa2b8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 27 15:36:28 2018 +0000
Bug 20450: (follow-up) Add missing template filters
This patch adds two missing template filters as pointed out by the
template test.
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: Nick Clemens <nick at bywatersolutions.com>
commit ba116a578b3115be1888bb23bc637b165f818fca
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Aug 9 22:13:32 2018 +0000
Bug 20450: Add collection to item table when placing a hold on a specific copy (OPAC)
This patch adds a new collection column to the item table when selecting
a specific item for a hold. The column will only appear if at least
one item has a collection set.
To test, in OPAC:
- Place a specific hold on
- a record with one or more items with collections
- a record with one or more items without collections
- Verify the collections display correctly when they exist
- Verify the table still works as expected
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2953c6c6cde6dfdbc33248cd98178508d465eeec
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Aug 9 21:28:30 2018 +0000
Bug 20450: Add collection to item table when placing a hold on a specific copy (Intranet)
This patch adds a new collection column to the item table when selecting
a specific item for a hold. The column will only appear if at least
one item has a collection set.
To test, in staff:
- Place a specific hold on
- a record with one or more items with collections
- a record with one or more items without collections
- Verify the collections display correctly when they exist
- Verify the table still works as expected
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 45f90d9b6dd07aed6f853b18a5ce86d93c9d6a48
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Aug 8 19:52:26 2018 +0000
Bug 20896: Move serial enumeration after callnumber on intranet detail page
The column with serial enumeration/chronology information is moved
from the back to the right of itemcallnumber on the intranet detail
page.
To test:
- Apply patch
- Look at different detail pages in staff:
- 1 or more items have serial enumeration information
- no item has serial enumeration informatoin
- Verify
- itemcallnumber is now followed by serial information, if
an item with the field filled in exists for the record
- all other functionality, like sorting, works as expected
https://bugs.koha-community.org/show_bug.cgi?id=20896
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 13c1b6f123d7b9fd294704740903959b8e9e5154
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Oct 27 14:20:37 2018 +0000
Bug 19263: DBRev 18.06.00.047
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4a70f3a1ca4ce5c33c7efe17ca38d90d3cfbbdf7
Author: Cori Lynn Arnold <carnold at dgiinc.com>
Date: Fri Oct 12 13:13:12 2018 +0000
Bug 19263: Rancor - 001 widget - changes to address QA issues
Changes were made to address QA issues from Comment 17
Tests:
1) Verify that a new entry for CONTROL_NUM_SEQUENCE is added to table authorised_value_categories
2) Edit a bib record using advanced editor and note that the 001 widget isn't there when adding/editing 001 field
3) Add a new row into authorised_values table with:
a) CONTROL_NUM_SEQUENCE in category column
b) authorised_value column has a string ending with a number i.e. sprLib0001
c) lib column has a short string indicating the type of control number i.e. "Springfield Library"
4) Edit a bib record using the advanced editor and note that the 001 widget is there when adding / editing 001 field
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6f8fe7e22a59cef7bd1804440cbd7ceaaddf25b7
Author: Cori Lynn Arnold <carnold at dgiinc.com>
Date: Tue Oct 9 12:48:58 2018 +0000
Bug 19263: Rancor - 001 widdget only for configured client
Tests:
1) Verify that a new entry for CONTROL_NUM_SEQUENCE is added to table
authorised_value_categories
2) Edit a bib record using advanced editor and note that 001 widget
isn't there when adding/editing 001 field
3) Add a new row into authorised_values table with:
a) CONTROL_NUM_SEQUENCE in category column
b) authorised_value column has a string ending with a number i.e.
"faw0001"
c) lib column has a short string indicating type of control number
i.e. "FAW"
4) Edit a bib record using the advanced editor and note that the 001
widget is there when adding / editing 001 field
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6fd74beeababe6741c5d551f8753eee122e9962b
Author: Cori Lynn Arnold <carnold at dgiinc.com>
Date: Mon Oct 8 16:10:16 2018 +0000
Bug 19263: Rancor - 001 widget - db update
In advanced editor mode for cataloging, the 001 widget will
automatically assign the next control number if a format is defined
in authorised_values table.
To test you need access to the database.
1) Verify that a new entry for CONTROL_NUM_SEQUENCE is added to
table authorised_value_categories
2) Enter a new value for authorised_values with the authorised_value
column ending in a number
3) Edit a record using the advanced editor, specifically the 001
field
4) Note the new widget and option to increment or assign manually.
The buttons fit within the widget now, and there's a database update
to create the CONTROL_NUM_SEQUENCE.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 36d46cf9972ca906cae0d29cc2cdd2d5b5545316
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Tue Nov 10 12:04:14 2015 -0700
Bug 19263: Rancor - Add auto-001 widget
To test:
1 - Define a new authorised valued category "CONTROL_NUM_SEQUENCE"
2 - Add a value/sequence
The authorised_value is the starting value - shoudl end in a number
that can be incremented e.g. "control_sequence_001"
The description field is the name for the seqeuence
Opac description is unused
3 - Edit a record in rancor
4 - Note the new widget and option to increment or assign manually
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 593b43f9b694a86e4509960b7b3942056b52e7cb
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Oct 27 13:24:30 2018 +0000
Bug 18591: (RM follow-up) Fix filter
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4d8ac89c0e082f2764d708b991764783d38987e3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Oct 27 13:21:09 2018 +0000
Bug 18591: DBRev 18.06.00.046
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 98b0a683c4507cc1a96db2a2216d205a8fb76cc2
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Oct 5 14:31:48 2018 +0100
Bug 18591: (follow-up) Add more POD
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 678e022bbbf039cbafcd55ad3ccd767ee3749544
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Oct 5 14:20:11 2018 +0100
Bug 18591: (follow-up) Add missing html filters
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2460eb0597b699eb8c4afc19c727091fca1f4200
Author: Magnus Enger <magnus at libriotech.no>
Date: Mon Nov 20 14:14:30 2017 +0000
Bug 18591: Allow any number of comments on ILLs
This patch makes it possible to add arbitrary comments to ILL
requests. Comments are read only and displayed in chronological
order. Comments can be added by librarians, but also added automatically
based on comments in the different protocols, so that comments from the
lending library can also be added.
To test:
- Enable the ILL module ("ILLModule" syspref + config in koha-conf.xml)
- Install the Dummy backend from here:
https://github.com/PTFS-Europe/Dummy
- Create a Dummy ILL request
- Add comments to the request, checking that the name and borrowernumber
of the person that added the comment is displayed ok
- Check that the displayed date and time the comment was submitted follows
the "dateformat" syspref
- On the "List requests" page, check that the correct number of comments
is displayed in the "Comments" column
- Check that the tests pass:
prove t/db_dependent/Illcomments.t
Signed-off-by: andrew.isherwood at ptfs-europe.com
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cf5835fc5286c7e087da2eeec06cf0417a2502d3
Author: Magnus Enger <magnus at libriotech.no>
Date: Sat Nov 11 14:02:22 2017 +0000
Bug 18591: Database updates
Signed-off-by: andrew.isherwood at ptfs-europe.com
Bug 18591: (QA follow-up) Fix merge error in kohastructure.sql
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/{Illrequestattribute.pm => Illcomment.pm} | 33 +++++---
Koha/{Illrequestattribute.pm => Illcomments.pm} | 35 +++++---
Koha/Illrequest.pm | 16 ++++
Koha/Schema/Result/Borrower.pm | 19 ++++-
Koha/Schema/Result/Illrequest.pm | 19 ++++-
ill/ill-requests.pl | 25 +++++-
installer/data/mysql/kohastructure.sql | 22 +++++
installer/data/mysql/mandatory/auth_val_cat.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 35 ++++++++
koha-tmpl/intranet-tmpl/prog/css/cateditor.css | 9 +++
.../intranet-tmpl/prog/css/src/staff-global.scss | 16 ++++
.../prog/en/includes/cateditor-widgets-marc21.inc | 61 +++++++++++++-
.../prog/en/modules/catalogue/detail.tt | 42 +++++-----
.../prog/en/modules/ill/ill-requests.tt | 59 +++++++++++++-
.../prog/en/modules/reserve/request.tt | 9 +++
.../intranet-tmpl/prog/en/modules/tools/export.tt | 28 ++++---
.../prog/en/modules/tools/holidays.tt | 38 +++++----
.../prog/en/modules/tools/import_borrowers.tt | 34 ++++----
.../prog/en/modules/tools/inventory.tt | 29 ++++---
.../prog/en/modules/tools/manage-marc-import.tt | 30 +++----
.../modules/tools/marc_modification_templates.tt | 27 ++++---
.../prog/en/modules/tools/modborrowers.tt | 25 +++---
.../prog/en/modules/tools/overduerules.tt | 27 ++++---
.../prog/en/modules/tools/picture-upload.tt | 30 +++----
.../prog/en/modules/tools/quotes-upload.tt | 27 ++++---
.../intranet-tmpl/prog/en/modules/tools/quotes.tt | 27 ++++---
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 7 ++
opac/opac-reserve.pl | 11 ++-
reserve/request.pl | 6 ++
svc/cataloguing/control_num_sequences | 59 ++++++++++++++
t/db_dependent/Illcomments.t | 84 ++++++++++++++++++++
32 files changed, 699 insertions(+), 195 deletions(-)
copy Koha/{Illrequestattribute.pm => Illcomment.pm} (63%)
copy Koha/{Illrequestattribute.pm => Illcomments.pm} (65%)
create mode 100755 svc/cataloguing/control_num_sequences
create mode 100644 t/db_dependent/Illcomments.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list