[koha-commits] main Koha release repository branch master updated. v18.11.00-1025-g41e0ff7
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 5 15:24:49 CEST 2019
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 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1 (commit)
via 3eee6f3091fcb621152af7f4db6441c98cb74558 (commit)
via c786e4de2369de34ce26610309cbce53534446d3 (commit)
via 29dd8d62943c303c60284e0430b1b7230891b97a (commit)
via fc188dfc825eb81fb6969305e8945b95138cbd41 (commit)
via 8629a11601371a0c20505c5b1f70a45745068e02 (commit)
via 54cf1df239e3b83ae5550e3ef499038dd5597d95 (commit)
via 0e0a3173859d4374087e99e1a7cd929c8da61c76 (commit)
via 05e49e6be98723f67ec85a5843fad1fc9787925f (commit)
via 40503c8fa86e6c4480ec8ca59e28f0c6f394502d (commit)
via b1c70a3c7e667137e54c88a2e02b5ca5ad5ee10b (commit)
via ced69febf3de17691d885e9ee7e03ef46c28b2ae (commit)
via cf95f0a7e6897d3dc4b90c92ffad19230379d7cb (commit)
via a5fcd93f72687e946d9bfbdc2541ed4a18704125 (commit)
via f6bc67e851722451a970d085f51fb11fb03e21b3 (commit)
from 6666918dd661b0207366becefd1480257197a353 (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 41e0ff7cd6240c2c9ba2d1bec816b191ef091eb1
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Thu Mar 7 20:28:48 2019 +0000
Bug 21003: Made Edit keywords more consistent in add_items-step2.tt
When adding a course reserve with a barcode that already exists, the
title, breadcrumbs, and legend of the form all specify that the user is
editing, and not adding, the book.
Test plan:
Same as comment 1
Signed-off-by: Devinim <kohadevinim at devinim.com.tr>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3eee6f3091fcb621152af7f4db6441c98cb74558
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Thu Mar 7 02:50:12 2019 +0000
Bug 21003: Removed warning and changed wording on add_items-step2.tt
When editing an item in a Course Reserve, the page displayed is the same
that is displayed when adding an item to a Course Reserve. This patch
removes the warning 'This course already has this item on reserve' when
the item is being edited, as well as changes the title, breadcrumbs, and
header of the div. This patch also Changes the header of the div to say
'Edit 'book_name' in 'course_name'' instead of 'Add 'book_name' to
'course_name'' when adding items to a course reserve if the item is
already present.
To test:
1) Create a new course in Course Reserves (you will need Course
Reserves enabled in syspref)
2) Add an item by clicking the Add reserves button
3) Click the edit button on the right hand side of the item listing
under the Reserves heading
4) Observe that the warning 'The course already has this item on reserve' appears, and that the title, breadcrumbs and
header of the div all say Add/Reserve
5) Apply the patch
6) Repeat step 3 and observe that the title, breadcrumbs and header of
the div now say Edit
7) Also verify that when adding a reserve with a barcode that does not
yet exist in the course reserves that the warning 'The course already...' is not displayed and that the header of the div says Add
8) Finally verify that when adding a reserve with a barcode that DOES
exist in the course reserves that the warning 'The course already...' IS
displayed and the header of the div says Edit
9) Sign off!
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c786e4de2369de34ce26610309cbce53534446d3
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Thu Mar 14 03:47:59 2019 +0000
Bug 12441: Search.pl conditional checks and displays using same syspref
Script search.pl checks OPACdefaultSortField and OPACdefaultSortOrder, but
shows defaultSortField and defaultSortOrder when using Advanced Search
in the staff client.
Test plan:
Apply the patch and then check that the Advanced Search uses
defaultSortOrder and defaultSortField sysprefs instead of the OPAC
sysprefs in the conditional. Check that sort behaviour in Advanced
Search still functions as expected. (It should do - this doesn't change
what displays, just improves consistency).
Sponsored-by: Catalyst IT
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 29dd8d62943c303c60284e0430b1b7230891b97a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Mar 23 09:43:47 2019 +0000
Bug 13782: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fc188dfc825eb81fb6969305e8945b95138cbd41
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 22 18:16:33 2019 +0000
Bug 13782: RSS for news needs a bit of styling
This patch makes a number of updates to the display of news in the OPAC.
I hope that this makes OPAC news nicer/easier to read. It includes style
changes to make the RSS link look better too.
To test, apply the patch and regenerate the OPAC CSS. You should have
multiple active news items. View the OPAC news with varied values of
NewsAuthorDisplay and OpacNewsLibrarySelect.
Test the single news item view. Test with Quotes on and off, and with
OpacMainUserBlock populated or not.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8629a11601371a0c20505c5b1f70a45745068e02
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Mar 22 16:43:51 2019 +0000
Bug 22568: Replace RSS icon in the OPAC with Font Awesome
This patch removes the RSS icon image (feed-icon-16x16.png) from the
OPAC and replaces it with Font Awesome icons styled to match.
To test, apply the patch and regenerate the OPAC CSS. View the
following pages, confirming that the RSS icon looks correct:
- OPAC home page (RSS news icon)
- Search results page (Subscribe to search)
- Recent comments
- Search history
- Lists -> View list
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 54cf1df239e3b83ae5550e3ef499038dd5597d95
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Mar 7 16:04:25 2019 +0000
Bug 22475: Shelving location doesn't appear on tags list view
This patch corrects the tags list view so that shelving location appears
correctly. Previously the template tried to display a variable which was
empty.
To test, apply the patch and locate an title which has both a tag
applied to it and a shelving location defined for one or more items. Go
to Tools -> Tags and click the tag to view titles with that tag. In the
location column of the table the shelving location should appear along
with library and call number.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0e0a3173859d4374087e99e1a7cd929c8da61c76
Author: Björn Nylén <bjorn.nylen at ub.lu.se>
Date: Thu Mar 28 10:28:29 2019 +0100
Bug 10345: Increment copy number when adding multiple copies.
To test:
1. Add multiple copies of an item with data in the 'Copy number' field. Note that tha data will be identical for all items.
2. Apply patch.
3. Add multiple copies of an item with a positive integer (ie. only digits) in the 'Copy number' field. Note that the copy number is incremented for each item.
4. Add multiple copies of an item with some other type of data in the 'Copy number' field. Note that the copy number field remains unchanged for the added items.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 05e49e6be98723f67ec85a5843fad1fc9787925f
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Apr 2 09:57:35 2019 +0200
Bug 22620: OPAC description for CCODE in opac-reserve.tt
Bug 20450 added CCODE to opac-reserve.tt using AuthorisedValues TT plugin.
This patch changes the plugin call so that it requests OPAC description.
Test plan :
1) Define a CCODE with staff and OPAC descriptions
2) Apply this collection on an item
3) At OPAC, place an hold on this item
4) Verify the collection display correctly OPAC description and not staff description
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 40503c8fa86e6c4480ec8ca59e28f0c6f394502d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 26 14:11:28 2019 +0000
Bug 22575: Item type administration uses invalid error class for dialog
This patch modifies the item types administration script so that it
passes a valid message type to the template, where the type is used as a
CSS class. "Error" is a nonexistent dialog class. It should be "alert."
To test, apply the patch and go to Administration -> Item types.
- Try to delete an item type which is in use. The style of the error
dialog should be correct.
- Try to add an item type using a code which already exists. The error
should look correct.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b1c70a3c7e667137e54c88a2e02b5ca5ad5ee10b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 28 13:12:59 2019 +0000
Bug 22432: Star ratings plugin replacement missing from a couple pages
This patch modifies two templates to conform to the change to the start
ratings plugin: Overdrive search results and RecordedBooks search
results.
On the Overdrive page, the star ratings are now correctly displayed
using the new plugin. On the RecordedBooks page, star ratings code has
been removed because it is unused. RecordedBooks doesn't provide ratings
information in their API.
To test you need credentials for both Overdrive and RecordedBooks. Apply
the patch and enable both services.
- In the OPAC, perform a search that will return results from Overdrive
and RecordedBooks.
- Open the search results for each of those services.
- On the Overdrive search results page, star ratings should appear
correctly (in read-only mode).
- On the RecordedBooks page everything should look the same.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ced69febf3de17691d885e9ee7e03ef46c28b2ae
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Mar 23 08:51:15 2019 +0000
Bug 22607: DBRev 18.12.00.037
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cf95f0a7e6897d3dc4b90c92ffad19230379d7cb
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Mar 29 08:13:48 2019 +0000
Bug 22607: Change default value in issues.renewals to '0'.
This patch change renewals column of issues and old_issues tables.
Now it is NOT NULL default 0. It does not make sense when number of
renewals is undefined, it is always integer with value zero or more
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a5fcd93f72687e946d9bfbdc2541ed4a18704125
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 2 00:34:43 2019 +0000
Bug 22619: Fix null empty behaviour for new rules
To test:
1 - Go to Admin->Circulation and fines rules
2 - Set All/All rules ot have a limit for Current checkouts allowed (and onsite checkouts allowed)
3 - Select an itemtype to add a new rule
4 - Save without entering any values
5 - Note that new rule displays with the same numebr as the all/all rule
6 - Check the DB, not no lines were added to circulation_rules table
7 - Delete the rule from the staff client
8 - Apply patch
9 - Repeat, note the new rule is unlimited
10 - Run selenium tests
11 - They pass!
12 - Check no rules/itemtypes are added to your system by the tests
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f6bc67e851722451a970d085f51fb11fb03e21b3
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Apr 1 12:16:51 2019 +0100
Bug 22611: Correction for call to get create_item in EDI.pm
There was a typo in the addition of a call to
effective_create_items causing processing to abort after adding
a single copy.
This patch reverts to using the C4::Context call as used for the
first copy created, the intended call to effective_create_items
is a wrapper around that as the field in the basket is guaranteed
to be null (its not set when we call AddBasket). Being consistent
and explicit in what we call should guard against future changes
in dependencies exposing the logic flaw
Added some comments to make logical flow of code clearer
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/EDI.pm | 6 +-
admin/itemtypes.pl | 10 +-
admin/smart-rules.pl | 5 +-
catalogue/search.pl | 4 +-
cataloguing/additem.pl | 8 ++
course_reserves/add_items.pl | 2 +
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 14 +++
.../en/modules/course_reserves/add_items-step2.tt | 12 ++-
.../en/modules/course_reserves/course-details.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tags/list.tt | 5 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 55 +++++++++--
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 102 ++++++++++++--------
.../bootstrap/en/modules/opac-overdrive-search.tt | 22 +++--
.../en/modules/opac-recordedbooks-search.tt | 10 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 9 +-
.../bootstrap/en/modules/opac-search-history.tt | 16 ++-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
.../bootstrap/en/modules/opac-showreviews.tt | 2 +-
.../opac-tmpl/bootstrap/images/feed-icon-16x16.png | Bin 764 -> 0 bytes
t/db_dependent/selenium/administration_tasks.t | 18 +++-
24 files changed, 217 insertions(+), 97 deletions(-)
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/images/feed-icon-16x16.png
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list