[koha-commits] main Koha release repository branch master updated. v18.11.00-1269-g3d84015
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 19 17:11:04 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 3d840153d1e9736f126b04b96eea4367d096996b (commit)
via 7b7a2767c826abcb507a5fe2466ecbdcea6f9d2c (commit)
via 99cd771b09a6462381001ab98f7d833ca247c439 (commit)
via d8dfb61a9099cd9c07b22bf1d5a4cc2a834f2fc6 (commit)
via b3de8738b7f8db23c99b588a11da2225bd67106c (commit)
via 5e20e438e80465fcd6f1c2af5e6138a639dec5f3 (commit)
via 646e9fe3009b38694bc109611506932a3008932b (commit)
via 38d68299ce7405823c50a6a41ac0f5d18b0b9044 (commit)
via 0bbebced9dd463444cb1d91a60bcf4323e5a721e (commit)
via f751423d155d25b1ba80b4c429191389b46b6bcb (commit)
via ac6dc3b2c12cf16464e8676f4e2da6ec99e34e70 (commit)
via b969ccbf97c218da2bf6e22ab7773baf36c4fa71 (commit)
via 31ace6a9347a8260532f6cc50d55fc36f87f1b44 (commit)
via 7262bc066784247b12ce7f25c390498086e1d72b (commit)
via 170085397b23d9b688628a56039f5e485fade6a5 (commit)
via 4f14f7c7af13a7ee29c68302bad1ff8ac12c7fdf (commit)
via b038195735d2e9e64598cf12485aff3c4eeb1948 (commit)
via 44e1cb20649b8b03a0f1036a05b0b7cf5e42c3e1 (commit)
via a488c9f4512eafa3d742b3e8204c2ca8cc850987 (commit)
via 7a603d98d14527509fd38eb29ceb360ba0030904 (commit)
via 8adb2f8003e25f6fe8cc78506a823a618a837fa1 (commit)
via c54c12f53d75598f2b014fb03c14aa2b1d7bb7c5 (commit)
via 87026c6cad4bd65d7ed643ece830462f0ee95639 (commit)
from 296e0ce224debc9e1541683220df2306e166963f (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 3d840153d1e9736f126b04b96eea4367d096996b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 19 14:51:08 2019 +0000
Bug 22564: DBRev 18.12.00.060
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7b7a2767c826abcb507a5fe2466ecbdcea6f9d2c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 19 09:53:53 2019 +0000
Bug 22564: (QA follow-up) Correct copy-paste message
We should be replacing Rep here ;)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 99cd771b09a6462381001ab98f7d833ca247c439
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Mar 29 13:35:27 2019 +0000
Bug 22564: Add UI handling for 'Replaced'
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d8dfb61a9099cd9c07b22bf1d5a4cc2a834f2fc6
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Mar 29 12:20:26 2019 +0000
Bug 22564: Add database update 'just in case'
With the introduction of the 'status' field it's a clear oportunity to
convert any last remaining instances of 'Rep' to 'L' + 'REPLACED'.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b3de8738b7f8db23c99b588a11da2225bd67106c
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Mar 22 15:49:13 2019 +0000
Bug 22564: Remove references to 'Rep' accounttype
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5e20e438e80465fcd6f1c2af5e6138a639dec5f3
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Mar 6 14:07:50 2019 +0000
Bug 22464: Pass forward parameters
This patch ensures that parameters that are present are passed forward
when accepting the copyright notice.
Test plan:
- Clone the latest version of the FreeForm backend from:
https://github.com/PTFS-Europe/koha-ill-freeform
- Ensure the ILLModuleCopyrightClearance syspref is populated
- Create an OpenURL in order to pre-populate the FreeForm form, a suitable URL would be:
<your_koha_instance>/cgi-bin/koha/opac-illrequests.pl?openurl=true&backend=FreeForm&method=create&opac=1&atitle=Theater%20careers.%20%5Belectronic%20resource%5D%20%3A%20a%20realistic%20guide.&aulast=Donahue%2C%20Tim&date=2012&genre=article&isbn=978123123123&issn=1234-5678&issue=34&pages=12-34&sid=EBSCO%3AAthlone%20Institute%20of%20Technology%3Aait.101326&title=article%20title%20here&volume=12
- Log in
- Accept the copyright notice
=> TEST: Observe that the FreeForm form is pre-filled with the metadata
supplied in the OpenURL
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 646e9fe3009b38694bc109611506932a3008932b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 7 17:18:00 2018 +0000
Bug 21783: Reindent admin/columns_settings.tt
This patch reindents admin/columns_settings.tt to use four spaces
instead of two for indentation, following coding guidelines.
To test, apply the patch and compare the file to master using the -w
flag to ignore whitespace. The only changes should appear where lines
were added during indentation.
Go to Admin -> Columns settings and confirm that everything works
correctly.
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 38d68299ce7405823c50a6a41ac0f5d18b0b9044
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Apr 11 10:32:52 2019 +0100
Bug 22687: Typo correction for Portuguese manual link
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0bbebced9dd463444cb1d91a60bcf4323e5a721e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Apr 17 11:20:25 2017 -0400
Bug 16149: Generate and send custom notices based on report output
Ths patch add an EmailReport function to C4::Reports::Guided
It accepts a notice (module, code, branch) and a report and attempts to
email notices to patron, generating content using report content.
Notice must be in template toolkit syntax, only columns in report are
available for notice.
To test:
1 - Specify various options
2 - Ensure errors are returned if options are incomplete or incorrect
3 - Pass a report containing 'from' and 'email' and 'borrowernumber'
columns and ensure message queue populated as expected
Signed-off-by: Jessica Ofsa <jofsa at vt.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f751423d155d25b1ba80b4c429191389b46b6bcb
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri May 12 17:13:07 2017 -0400
Bug 16149: Unit tests
To test:
prove -v t/db_dependent/Reports/Guided.t
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jessica Ofsa <jofsa at vt.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ac6dc3b2c12cf16464e8676f4e2da6ec99e34e70
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Apr 6 12:42:39 2019 +0000
Bug 22649: Add itemtype to item search results and CSV file
The itemtype can be searched for in the item search form, but
it is not displayed in the result list.
This patch adds the itemtype to the display and the CSV export
file.
To test:
- Try different item searches
- Verify that the itemtype now shows in the result list
- Export to CSV
- Verify that the itemtype shows there correctly as well
Signed-off-by: Axel Amghar <axel.amghar at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b969ccbf97c218da2bf6e22ab7773baf36c4fa71
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Mar 12 11:19:35 2019 +0000
Bug 22174: Add link to help page for API key management
Makes the help link on the API key management page point
to the proper section in the Koha manual.
To test:
- Activate RESTOAuth2ClientCredentials system preference
- Go to any patron account
- Go to More > Manage API keys
- Click on the Help link in top right corner
- Verify that the right section of the Koha manual displays
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 31ace6a9347a8260532f6cc50d55fc36f87f1b44
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Dec 3 18:02:03 2018 +0100
Bug 21937: Syspref autoBarcode annual doesn't increment properly barcode
This patch fix the barcode annual builder. The test should pass.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7262bc066784247b12ce7f25c390498086e1d72b
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Dec 3 18:27:08 2018 +0100
Bug 21937: Add test to show autoBarcode annual increment bug
This patch show the issue. If the DB contains a barcode (not auto attributed
by Koha) which begin with the year used to generate automatically a new one,
there may be a 'collision'.
prove -v t/db_dependent/Barcodes_ValueBuilder.t
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 170085397b23d9b688628a56039f5e485fade6a5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Dec 27 17:07:20 2016 +0000
Bug 15505: Mark Hold Items 'On hold' instead of 'Available'
This patch adds a 'pending hold' column to C4::Items:GetItemsInfo to
allow for displaying status of an item when it has been selected for a
hold by the holdsqueue and AllowItemsOnHoldCheckout is set to 'Don't
allow'
To test:
00 - Set AllowItemsOnHoldCheckout to 'Allow'
01 - Place a hold on an item
02 - Build the holdsqueue (kohadevbox example below)
sudo koha-shell kohadev
perl misc/cronjobs/holds/build_holds_queue.pl
03 - Search for the item on the OPAC
04 - Note item shows as 'Available' in results and details
05 - Toggle AllowItemsOnHOldCheckout to 'Don't allow'
06 - Repeat search, note there is no change
06 - Apply Patch
07 - Search for the item on the OPAC
08 - Note that item now shows as 'Pending hold'
09 - Toggle AllowItemsOnHoldCheckout to Allow
10 - Note item shows as available
11 - prove -v t/db_dependent/Items.t
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4f14f7c7af13a7ee29c68302bad1ff8ac12c7fdf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Mar 11 13:18:06 2019 +0000
Bug 21307: (follow-up) QA fixes
This patch corrects a couple of issues discovered by QA: Removed markup
copy-and-paste error; Add some CSS to help the responsive behavior of
the advanced editor controls at smaller browser widths.
To test, apply the patch and open the advanced MARC editor. Test the
appearance of the page at various browser widths. At narrower widths the
status bar and search fields should behave well.
Signed-off-by: Michal Denar <black23 at gmail.com>
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 b038195735d2e9e64598cf12485aff3c4eeb1948
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 5 14:53:18 2019 +0000
Bug 21307: (follow-up) Change the way Codemirror height is calculated
This follow-up changes the way the height of the Codemirror editor is
calculated. Using offset() instead of position() returns the correct
values with the changed markup.
To test, apply the patch and load the advanced MARC editor. The "status
bar" should display correctly a the bottom of the editor and there
should be no double scrollbar.
Signed-off-by: Michal Denar <black23 at gmail.com>
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 44e1cb20649b8b03a0f1036a05b0b7cf5e42c3e1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Mar 11 14:25:27 2019 +0000
Bug 21307: Switch two-column templates to Bootstrap grid: Cataloging
This patch modifies two cataloging templates to use the Bootstrap grid
instead of YUI.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Cataloging -> Edit record using the advanced editor
- Cataloging -> Edit items
Signed-off-by: Michal Denar <black23 at gmail.com>
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 a488c9f4512eafa3d742b3e8204c2ca8cc850987
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 27 13:16:34 2019 +0000
Bug 22584: Add YAML support for Codemirror
This patch adds the dependencies required to provide YAML syntax
highlighting in CodeMirror text areas. The OpacHiddenItems system
preference configuration is updated to use a "text/x-yaml" CodeMirror
syntax.
To test, apply the patch and go to Administration -> System preferences
-> OPAC.
Expand the OpacHiddenItems preference and test that YAML-formatted text
entry has the correct syntax highlighting.
Signed-off-by: Michal Denar <black23 at gmail.com>
https://bugs.koha-community.org/show_bug.cgi?id=2700
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7a603d98d14527509fd38eb29ceb360ba0030904
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Apr 12 14:32:46 2019 +0000
Bug 22697: Reindent catalogue/result.tt
This patch reindents the template for staff client catalogue search
results. The only non-whitespace changes are comments to help identify
closing tags and template directives.
To test, apply the patch and perform a catalog search in the staff
client. The results should look correct.
The diff using the '-w' flag to ignore whitespace should
highlight only moved lines and added comments.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
https://bugs.koha-community.org/show_bug.cgi?id=22679
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8adb2f8003e25f6fe8cc78506a823a618a837fa1
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Feb 19 01:36:14 2019 +0000
Bug 22365: Removing warn when accessing Log Viewer
To test:
Go to Tools -> Log Viewer and confirm the warn no longer shows after
applying the patch.
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 c54c12f53d75598f2b014fb03c14aa2b1d7bb7c5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 4 15:32:17 2018 +0000
Bug 21942: Clean up cataloging merge template
This patch makes a few minor markup corrections to the cataloging merge
template:
- Remove invalid "type" attributes from <style> and <script>
- Add missing closing </span>
- Remove obsolete YUI grid markup
To test, apply the patch and test the process of merging records in
Cataloging. Everything should look correct and work correctly.
Validating the HTML source should return no errors stemming from the
template.
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 87026c6cad4bd65d7ed643ece830462f0ee95639
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 22 13:26:01 2019 +0000
Bug 21308: Results from order search do not show the search parameters
This patch modifies the orders search results page so that the search
form appears in the sidebar. This allows the user to view and re-use
their search parameters.
This patch also moves the "no search results" message to the top of the
page in a message box.
To test, apply the patch and go to Acquisitions -> Orders search.
- Perform a search which will return results. In the sidebar you should
see the full orders search form with your search parameters in the
form fields.
- Perform a search which will return no results. You should see the
"Your search returned no results." message in a standard message
dialog.
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Barcodes/ValueBuilder.pm | 2 +-
C4/Circulation.pm | 2 +-
C4/Items.pm | 3 +
C4/Reports/Guided.pm | 97 ++
C4/XSLT.pm | 7 +-
Koha.pm | 2 +-
Koha/Account.pm | 2 +-
Koha/Illrequest.pm | 1 +
Koha/Manual.pm | 3 +-
catalogue/itemsearch.pl | 2 +-
installer/data/mysql/updatedatabase.pl | 18 +
koha-tmpl/intranet-tmpl/lib/codemirror/yaml.js | 121 +++
koha-tmpl/intranet-tmpl/lib/codemirror/yaml.min.js | 1 +
koha-tmpl/intranet-tmpl/prog/css/cateditor.css | 14 +-
.../intranet-tmpl/prog/en/includes/accounts.inc | 1 +
.../en/includes/catalogue/itemsearch_item.csv.inc | 3 +-
.../en/includes/catalogue/itemsearch_item.json.inc | 2 +
.../prog/en/includes/cateditor-ui.inc | 2 +-
.../includes/csv_headers/catalogue/itemsearch.tt | 2 +-
.../prog/en/includes/filter-orders.inc | 2 +-
.../prog/en/modules/acqui/histsearch.tt | 53 +-
.../prog/en/modules/admin/columns_settings.tt | 383 +++----
.../prog/en/modules/admin/preferences.tt | 1 +
.../en/modules/admin/preferences/cataloguing.pref | 4 +-
.../en/modules/admin/preferences/circulation.pref | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 1 +
.../prog/en/modules/catalogue/itemsearch.tt | 7 +
.../prog/en/modules/catalogue/results.tt | 1067 ++++++++++----------
.../prog/en/modules/cataloguing/additem.tt | 34 +-
.../prog/en/modules/cataloguing/editor.tt | 52 +-
.../prog/en/modules/cataloguing/merge.tt | 6 +-
.../bootstrap/en/includes/account-table.inc | 1 +
.../bootstrap/en/includes/item-status.inc | 5 +
.../bootstrap/en/modules/opac-illrequests.tt | 3 +-
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 6 +
misc/cronjobs/patron_emailer.pl | 175 ++++
t/db_dependent/Barcodes_ValueBuilder.t | 6 +
t/db_dependent/Items.t | 15 +-
t/db_dependent/Reports/Guided.t | 55 +-
tools/viewlog.pl | 2 +-
40 files changed, 1378 insertions(+), 787 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/yaml.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/codemirror/yaml.min.js
create mode 100755 misc/cronjobs/patron_emailer.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list