[koha-commits] main Koha release repository branch master updated. v18.05.00-824-g705571a
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 28 22:05:46 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 705571a2b870fbb652ca210e32ee3e7ca050e75f (commit)
via a6a7516652115ccc49099f045ed8c23a9f29eb26 (commit)
via c86485f933a0eabdb8af215c5b74c5416d2cb95a (commit)
via 184c44ee31bf54ad179f9fb9fd501114902a0176 (commit)
via ca839922fd4bf3c455454f6dd9182203b1481831 (commit)
via 6975a6836a21f42675a9394602246891c19d9522 (commit)
via 8df47bdde678773f028f312b4cd8000a12425281 (commit)
via 024643f51c4e0ca1803dd5013bb857e98cd924e5 (commit)
via 1b56e446ed64cad9d4dd42a8cb3f1953f424e0aa (commit)
via 121b8105bcb00909b1e8081442148c1939c101a6 (commit)
via bf89e4e124fb38982fa8b9708af1fb67fd16f982 (commit)
via 01470fab9eabd3750746b540389de7a6d85fda05 (commit)
via 33010595113b5ec279f93b1127d20b466e1ea023 (commit)
via e5750b27d4272cb7f001647090773197c495b918 (commit)
via 35863802eab24bd39a75fcba0d16ac59dca6261e (commit)
via 2074421ba3a32979d797479cf124ae6bfb333d36 (commit)
via b70d2bc281d70aad2dce0c6021b60e4075641e49 (commit)
via 02a0f3185c4aad3c712346e6bcedd0736725f699 (commit)
via 72e2d729f290201b48e09192f0dc4b7fdd26db6b (commit)
via 75b5ce2a317dad5307d2490c2d2f16e3e3bc3e29 (commit)
via d52c88a233680412fb44dea9f6b5e9c29fe43841 (commit)
from de434c2398aa0629e6a9119cebb353ba517a20b9 (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 705571a2b870fbb652ca210e32ee3e7ca050e75f
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Thu Sep 27 07:54:27 2018 +0300
Bug 21416: 'gr' option missing from ZEBRA_LANGUAGE options in koha-sites.conf
'gr' (as in 'Greek') is missing from the ZEBRA_LANGUAGE options
in debian/templates/koha-sites.conf. This patch fixes that.
Test plan:
1) view koha-sites.conf and notice how 'gr' is missing from the
ZEBRA_LANGUAGE options
2) apply the patch
3) observe that koha-sites.conf now includes 'gr' as an option
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a6a7516652115ccc49099f045ed8c23a9f29eb26
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Sep 19 08:07:57 2018 +0000
Bug 21167: (QA follow-up) Use accounttype.inc for generating account description
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c86485f933a0eabdb8af215c5b74c5416d2cb95a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Sep 19 07:53:32 2018 +0000
Bug 21167: (QA follow-up) Fix amount formatting on invoice receipt
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 184c44ee31bf54ad179f9fb9fd501114902a0176
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Aug 8 19:26:47 2018 +0000
Bug 21167: Fix price formatting on printed fee invoice and receipt
The prices were not formatted correctly on the printed receipts
for fines and payments in the patron account.
This patch introduces the use of the Price TT plugin to those
templates.
Also:
- Fixes a few capitalization errors
- Removes spaces in front of :
- Updates accounttype-to-description list to the one used
in other templats as a lot of values were missing (Credit etc.)
To test:
- Create several fines, use some .00 and some with other values
- Pay some fines
- Create a manual credit
- Use print button for all of those (credit, fee, payment)
- Verify that:
- prices ending in .00 are displayed without the decimal part
- instead of Credit only C is shown in the description
- Apply patch
- Print invoices and receipts again
- Verify that:
- prices are now formatted according to CurrencyFormat system
preference, decimal part always included
- verify that correct description for Credit is shown
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ca839922fd4bf3c455454f6dd9182203b1481831
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Fri Aug 24 11:05:04 2018 +0300
Bug 20785: Advanced Editor does not honor MarcFieldDocURL
The advanced MARC editor, Rancor, doesn't obey MarcFieldDocURL.
Make it do so.
Test plan:
1) Enable EnableAdvancedCatalogingEditor
2) Set MarcFieldDocURL to eg. http://{MARC}.example.com/{LANG}/{FIELD}
3) Go to Cataloging -> Advanced editor
4) Go to any field and press Ctrl-H
5) Marc field documentation on www.loc.gov or ifla.org should open
6) Apply patch
7) Repeat 3 and 4. The Marc field docs should open on the URL you set
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
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 6975a6836a21f42675a9394602246891c19d9522
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sat Jul 14 14:29:53 2018 +0000
Bug 21078: overdrive.js Catch error if window.opener is not accessible
To Test:
0 - Enable overdrive search results on your koha
1 - From a source develop a link to your koha instance that opens a new
window:
<a target="_blank"
href="http://localhost:8080/cgi-bin/koha/opac-search.pl?q=love">Test</a>
2 - Click that link
3 - Note Overdrive results do not load
4 - Note error in JS console
5 - Apply patch
6 - Click the link again
7 - Note OD results load
8 - Note no error in console
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8df47bdde678773f028f312b4cd8000a12425281
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Aug 11 23:55:35 2018 +0000
Bug 20241: Fix display of publication year in subscription record search for MARC21
The old problem: UNIMARC uses biblio.publicationyear, MARC21 uses
biblio.copyrightdate. Patch adds a fallback, if there is nothing
in publicationyear, copyrightdate will be displayed.
To test:
- In a MARC21 database
- Add a new subscription
- Search for records
- Verify the publication year column remains empty
- Apply patch
- Repeat search
- Verify that the year now shows
https://bugs.koha-community.org/show_bug.cgi?id=20421
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 024643f51c4e0ca1803dd5013bb857e98cd924e5
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Fri Oct 13 14:07:21 2017 +0300
Bug 21362: Advanced editor: Fix tab navigation in fixed fields
Also minor tweaks to how the fields look.
Test plan:
1. Try moving from field to field and inside control fields with tab/shift-tab.
2. Make sure focus doesn't get stuck in any position.
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 1b56e446ed64cad9d4dd42a8cb3f1953f424e0aa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 21 17:55:40 2018 -0300
Bug 21396: Add 2 missing use statements in Koha::Account
1. require C4::Letters must be use C4::Letters (from bug 19191)
2. There is call to C4::Circulation::ReturnLostItem, but no use of
C4::Circulation (from bug 20631)
Test plan:
finger crossed, I ran the tests from t/db_dependent/Koha and they all
passed
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 121b8105bcb00909b1e8081442148c1939c101a6
Author: Jon Knight <J.P.Knight at lboro.ac.uk>
Date: Mon May 14 15:30:55 2018 +0000
Bug 16739: Show note instead of 500 error for 'Generate EDIFACT' when no EDI account is configured
When a book seller (vendor) does not have EDI account information configured
the basketgroup display still shows a button to generate EDIFACT output which
results in 500 error when clicked. This patch fixes two aspects of this:
a) it stops the button being displayed in the first place, replacing it with
a message that explains there is not EDIFACT configuration for the vendor.
b) if, somehow, an edifact print operation is passed to the basketgroup
script it detects the lack of an EAN and redirects back to the basket group
display page with a warning message.
To test:
1) Create a vendor with no EDI details.
2) Create a basket with some items in, then close it and add it to a basket
group for this vendor.
3) Go to that vendor's basket groups, click on the "Closed" tab and then
click on the 'generate edifact order' button. You should get a 500 error.
4) Apply this patch.
5) Repeat 3, except this time you should find that the 'generate edifact
order' button has been replaced with a note that there is
"No EDIFACT configuration for <vendor>".
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bf89e4e124fb38982fa8b9708af1fb67fd16f982
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 22 11:08:16 2018 -0300
Bug 21398: Make search field mandatory when adding to a basket from an existing record
Test plan:
- Create a basket
- Click the "Add to basket" button
- Click "Search" on the first line
=> Without this patch you get an ugly screen: https://snag.gy/U8X3ZK.jpg
=> With this patch applied you will not be able to submit without
filling the input in
QA note: Yes, we could handle that controller side as well, but much
more work.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 01470fab9eabd3750746b540389de7a6d85fda05
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 25 13:51:02 2018 +0000
Bug 21407: Can't enter new macros in the advanced cataloging editor (rancor)
This patch upgrades Codemirror to the latest version (5.40.2). Doing so
fixes a problem with the advanced cataloging editor's macro editor which
appears in the latest version of Firefox (62): The first line of the
macro editor is not visible.
To test, apply the patch and clear your browser cache if necessary.
EnableAdvancedCatalogingEditor must be set to "Enable."
- Go to Cataloging -> Advanced editor.
- Click the "Macros" toolbar button.
- In the main part of this modal window you should see a blank line
marked "1."
- Click "New macro..."
- The editor's line 1 should now be editable. Enter text to confirm that
it works correctly.
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 33010595113b5ec279f93b1127d20b466e1ea023
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 14 15:56:44 2018 -0700
Bug 21297: Display public lists to existing lists when adding a new item
If there are no private lists the public lists are not displayed.
Test plan:
1) Add 10 public lists (This is when the 'More lists' menu item becomes
view-able)
2) Select an item
3) Click Add to list
4) Select 'More Lists' menu item
5) Note that 'Select an existing list' is an available option
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e5750b27d4272cb7f001647090773197c495b918
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 28 19:17:13 2018 +0000
Bug 16424: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 35863802eab24bd39a75fcba0d16ac59dca6261e
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Sep 27 13:16:09 2018 +0000
Bug 16424: (QA follow-up) Use Modern::Perl
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2074421ba3a32979d797479cf124ae6bfb333d36
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Fri Nov 10 08:28:01 2017 +0200
Bug 16424: Update default values in advanced editor when changing frameworks.
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 b70d2bc281d70aad2dce0c6021b60e4075641e49
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Mon Sep 17 01:06:12 2018 +0300
Bug 16424: Handle framework code properly also when adding a new record
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 02a0f3185c4aad3c712346e6bcedd0736725f699
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Sun Sep 16 21:39:54 2018 +0300
Bug 16424: Make the svc/bib service keep the existing framework code
Previously the framework code would have been reset when the record was saved, but that seems to have been a mistake.
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 72e2d729f290201b48e09192f0dc4b7fdd26db6b
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Mon Sep 17 00:41:14 2018 +0300
Bug 16424: Minor CSS change for the advanced editor Settings menu
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 75b5ce2a317dad5307d2490c2d2f16e3e3bc3e29
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Sun Sep 16 21:37:06 2018 +0300
Bug 16424: Add framework support to advanced MARC editor
Keeps the selected framework, allows selecting another and validates the record using the correct framework. Contains additional minor tweaks to display proper error messages.
To test:
1. Add a record with a non-default framework in the basic editor.
2. Switch to advanced editor and make sure the settings menu displays the correct framework.
3. Save the record and confirm that the framework code did not change.
4. Change the framework and save the record again.
5. Verify that the framework code changed.
6. Change one framework to make an extra field mandatory.
7. Make sure that the field is required in the editor when the framework above is selected but not when another framework is selected.
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 d52c88a233680412fb44dea9f6b5e9c29fe43841
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Sep 19 09:34:21 2018 +0100
Bug 21377: Remove erroneous "html" filter use
The "html" filter that is being applied to these variable declarations
is inappropriate and has been removed.
I've also simplified things by removing two of the extraneous variable
declarations.
To test:
- Before applying the patch, on master, view the "Manage request" page
for an ILL request
- TEST: Observe that, apart from the "Edit request" button, the various
available action buttons do not display correctly
- Apply the patch
- TEST: Refresh the page and observe that the buttons now display
correctly
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Account.pm | 3 +-
acqui/basketgroup.pl | 30 ++-
cataloguing/editor.pl | 4 +
debian/templates/koha-sites.conf | 2 +-
.../lib/codemirror/codemirror-compressed.js | 10 +-
.../intranet-tmpl/lib/codemirror/codemirror.css | 198 +++++++++++++++-----
.../lib/koha/cateditor/koha-backend.js | 78 ++++++--
.../lib/koha/cateditor/marc-editor.js | 34 ++++
.../intranet-tmpl/lib/koha/cateditor/widget.js | 37 +++-
koha-tmpl/intranet-tmpl/prog/css/cateditor.css | 19 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 4 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../en/includes/acquisitions-add-to-basket.inc | 2 +-
.../prog/en/includes/cateditor-ui.inc | 31 ++-
.../prog/en/modules/acqui/basketgroup.tt | 17 +-
.../prog/en/modules/cataloguing/editor.tt | 17 ++
.../prog/en/modules/ill/ill-requests.tt | 8 +-
.../prog/en/modules/members/printfeercpt.tt | 23 +--
.../prog/en/modules/members/printinvoice.tt | 21 +--
.../en/modules/virtualshelves/addbybiblionumber.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js | 3 +-
members/printfeercpt.pl | 7 +-
serials/subscription-bib-search.pl | 2 +-
svc/bib | 3 +-
svc/bib_framework | 63 +++++++
svc/new_bib | 3 +-
26 files changed, 465 insertions(+), 158 deletions(-)
create mode 100755 svc/bib_framework
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list