[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-26-g43b6644
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 3 11:40:11 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, 18.05.x has been updated
via 43b6644818f71c2d3c4bf09c6c40b36f5c0522c2 (commit)
via 01588a68aa74c6fe32329178840e9cc542e2829c (commit)
via 9fbd65ca5228641042975169e8217a0f14ac28c4 (commit)
via 5d677af3b4b5095145c359f69f6304f24fe2d590 (commit)
from 025aa54a58c292631b0ff412fd59c3ee35813c18 (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 43b6644818f71c2d3c4bf09c6c40b36f5c0522c2
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>
(cherry picked from commit 121b8105bcb00909b1e8081442148c1939c101a6)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 01588a68aa74c6fe32329178840e9cc542e2829c
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>
(cherry picked from commit bf89e4e124fb38982fa8b9708af1fb67fd16f982)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9fbd65ca5228641042975169e8217a0f14ac28c4
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>
(cherry picked from commit 01470fab9eabd3750746b540389de7a6d85fda05)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5d677af3b4b5095145c359f69f6304f24fe2d590
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>
(cherry picked from commit 33010595113b5ec279f93b1127d20b466e1ea023)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
acqui/basketgroup.pl | 30 ++-
.../lib/codemirror/codemirror-compressed.js | 10 +-
.../intranet-tmpl/lib/codemirror/codemirror.css | 198 +++++++++++++++-----
.../en/includes/acquisitions-add-to-basket.inc | 2 +-
.../prog/en/modules/acqui/basketgroup.tt | 27 ++-
.../en/modules/virtualshelves/addbybiblionumber.tt | 2 +-
6 files changed, 196 insertions(+), 73 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list