[koha-commits] main Koha release repository branch master updated. v17.05.00-558-gb56c195
Git repo owner
gitmaster at git.koha-community.org
Thu Sep 7 20:06:08 CEST 2017
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 b56c19528e332381384639ed347d11508086c547 (commit)
via ddf494b18f6c422d3654b0a78a63be86f5356065 (commit)
via 693cc1122b2b96ef2fc176b07371a4608104eaaf (commit)
via 9ffda7a7bc9f627165954b8272f1bb71c1b2beff (commit)
via 6ed1513e5fe91772c1720963006bf8f04452416d (commit)
via 5f989a81dff29db78620057d70ed864b32486bc0 (commit)
via 6a9fafe3090333647244db99ccd39d53e51b781c (commit)
via 594c48fb5b2c03f5d638d7115e42820294e32343 (commit)
via 24003b84ce637d228a4062dcf29415eb8e4f2162 (commit)
via 3c31e6e795cda3ea9b2ae4372d36572fc9e06f61 (commit)
via 7aef2f3298b0348c2a3994e344e32e5bc41f1f07 (commit)
via f55af2fc078a7d6a05238232bc276e6924307179 (commit)
via 1ffba42465faaaa257a3a82555aaeaed0c23ae43 (commit)
via 62605145932c452bee8e5b6f49ce1b5a75803bd7 (commit)
via 8cb6ed24ffb6f7bfa74b7ea4062070cc5cd0e6d2 (commit)
via d60cc56613755a432bb0962b2e808229c8c575c1 (commit)
via d53f7607b57d253e7f95bb6c2d699ed3e93c84b1 (commit)
via ebd1039bbdb041c7691eaaa2a977af9cd1687d3e (commit)
from 0c6538f033f43cde33d186561a93a197467bd9a1 (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 b56c19528e332381384639ed347d11508086c547
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Sep 5 22:42:14 2017 +0000
Bug 19258: Prevent warn when reversing a payment
The following warn is triggered when I click the Reverse button next to
an individual payment on the Account tab:
CGI::param called in list context from package
CGI::Compile::ROOT::home_vagrant_kohaclone_members_boraccount_2epl line
63, this can lead to vulnerabilities. See the warning in "Fetching the
value or values of a single named parameter" at /usr/share/perl5/CGI.pm
line 436.
To test:
1) Go to a members detail page in staff side, create a manual invoice,
pay it
2) Go to the Account tab, click Reverse next to the payment you just
made
3) Notice warns
4) Apply patch and repeat steps 1 & 2
5) Warns should be gone
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ddf494b18f6c422d3654b0a78a63be86f5356065
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Sep 5 22:38:12 2017 +0000
Bug 19258: Preventing warns when paying a fine or charge from Pay selected button
The following warns are triggered when I click the Pay selected button:
CGI::param called in list context from package
CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 267,
this can lead to vulnerabilities. See the warning in "Fetching the
value or values of a single named parameter" at
usr/share/perl5/CGI.pm line 436.
CGI::param called in list context from package
CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line
273, this can lead to vulnerabilities. See the warning in "Fetching
the value or values of a single named parameter" at
/usr/share/perl5/CGI.pm line 436.
To test:
1) Go to a members detail page in staff side and create a manual
invoice
2) Go to the pay fines tab, select the fine you just created and click
Pay selected
3) Notice warns
4) Apply patch and repeat steps 1 & 2
5) Warns should be gone
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 693cc1122b2b96ef2fc176b07371a4608104eaaf
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Sep 5 22:34:18 2017 +0000
Bug 19258: Prevent warns when writing off an individual fine
The following warns are triggered when I click the Write Off button next
to an individual fine or charge:
CGI::param called in list context from package
CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 171,
this can lead to vulnerabilities. See the warning in "Fetching the
value or values of a single named parameter" at
/usr/share/perl5/CGI.pm line 436. (this shows many times)
Use of uninitialized value in subroutine entry at
/usr/share/perl5/URI/Escape.pm line 184.
To test:
1) Go to a members detail page in staff side and create a manual
invoice
2) Go to the pay fines tab, click the Write off button next to the
invoice you just created
3) Notice warns
4) Apply patch and repeat steps 1 & 2
5) Warns should be gone
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9ffda7a7bc9f627165954b8272f1bb71c1b2beff
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Sep 5 22:05:36 2017 +0000
Bug 19258: Prevent warn when paying a fine or charge
To test:
1) Go to a members detail page in staff client
2) Select the Fines tab in the left pane
3) Select the Create manual invoice tab below the button menu bar
4) Create a fine and click save (e.g. Type: Fine, Amount: 5.00)
5) Select the Pay fines tab below the button menu bar
6) Click Pay on the item
7) Blank the staff error log
8) click confirm
-- staff error log has message
9) apply this first patch
10) repeat steps 3-8
-- staff error log is blank
11) run koha qa test tools
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6ed1513e5fe91772c1720963006bf8f04452416d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Sep 5 21:16:05 2017 +0000
Bug 19257: Prevent warn when reopening a basket
To test:
1) Go to Acquisitions, find a vendor and a basket (create if you don't
have either)
2) Close the basket
3) View the basket and reopen it
4) Notice the warn
5) Apply the patch and repeat steps 1-3
6) Notice the warn no longer shows and the basket is reopened as
expected
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5f989a81dff29db78620057d70ed864b32486bc0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 10 14:15:09 2017 +0200
Bug 18921: Resolve a few warnings in C4/XSLT.pm
Resolves warnings like:
Use of uninitialized value in hash element at C4/XSLT.pm line 262.
Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267.
Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300.
Note: Line numbers are not exactly the same anymore.
Test plan:
[1] Enable XSLT view in OPAC
[2] Without this patch, you will probably have some of these warnings when
doing some opac searches.
[3] Apply this patch. Check the logs again.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6a9fafe3090333647244db99ccd39d53e51b781c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 7 14:15:20 2017 -0300
Bug 19214: prevent crash if club_template_field is called in list context
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 594c48fb5b2c03f5d638d7115e42820294e32343
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Aug 30 23:54:56 2017 +0000
Bug 19214: Prevent crash if ->club or ->patron is called in list context
To test:
1) Create a club template and a club.
2) Add a user to the club
3) Log in to the OPAC as that user
4) Go to 'your summary' and click the Clubs tab
5) Notice clubs do not load and a warn shows:
Template process failed: undef error - Cannot use "->find" in list
context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 62.
6) Go to the staff side and go to the member page of that user
7) Go to 'details' and click the Clubs tab
8) Notice clubs do not load and a warn shows:
Template process failed: undef error - Cannot use "->find" in list
context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 71.
9) Apply patch
1) Repeat steps 4-7, confirming the errors do not show and clubs info
loads correctly
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 24003b84ce637d228a4062dcf29415eb8e4f2162
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 12 11:49:37 2017 +0000
Bug 17893 - Move JavaScript to the footer on staff client catalog pages
This patch modifies multiple catalog-related pages in order to move
embedded JavaScript to the footer.
The JavaScript previously embedded in cat-toolbar.inc is moved to a
separate file (catalog.js).
To test, apply the patch and test JavaScript-driven interactions on all
modified pages, including JS which isn't page-specific (menus, help,
etc). The functionality of the catalog toolbar should be tested on each
page.
- Bibliographic detail pages (standard, MARC, labeled MARC, ISBD).
- Advanced search page
- Local cover image viewer
- Item search page
- Item detail page
- Search history page
- Checkout history page
https://bugs.koha-community.org/show_bug.cgi?id=17839
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3c31e6e795cda3ea9b2ae4372d36572fc9e06f61
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Fri Jan 27 03:37:31 2017 +0000
Bug 12691: Use Koha.Preference in Self-Checkout
For calls to SCOUserJS, SCOUserCSS, OPACUserCSS, AllowSelfCheckReturns,
OpacFavicon, ShowPatronImageInWebBasedSelfCheck, SelfCheckoutByLogin
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Bug 12691: [FOLLOW-UP] Follow-up patch
This patch fixes merge conflicts and fixes the problems in Comment 7
QA tools complain about missing bracket, will be fixed in next followup
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Bug 12691: [FOLLOW-UP] Missing bracket
Patch adds bracket to template file (Comment 16)
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Bug 12691: [FOLLOW-UP] Fixing some logic
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Patches have been squashed for readability and 1 removal occurrence of
display_patron_image has been reintroduced.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7aef2f3298b0348c2a3994e344e32e5bc41f1f07
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Aug 31 21:18:24 2017 +0000
Bug 19228: Trigger confirm delete when removing item from course
To test:
1) Enable UseCourseReserves syspref
2) Go to Course Reserves
3) Add a new course if you don't already have one
4) Add an item to the course
5) Click 'remove' to delete the item from the course
6) Notice the item deletes straight away with no confirmation prompt
7) Apply the patch
8) Repeat steps 4 and 5
9) Confirm the confirmation box pops up and works as expected
Sponsored-by: Catalyst IT
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f55af2fc078a7d6a05238232bc276e6924307179
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Aug 31 21:25:28 2017 +0000
Bug 19229: Return to course when cancelling out of edit form
To test:
1) Ensure UseCourseReserves is enabled
2) Go to Course Reserves, create a course
3) Edit course
4) Click Cancel
5) Notice you are returned to the courses home page rather than returned
to the course
6) Apply patch
7) Go to edit course and click cancel again
8) Confirm you are returned to the course and that this feels like the
natural expectation.
Sponsored-by: Catalyst IT
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1ffba42465faaaa257a3a82555aaeaed0c23ae43
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Sep 7 11:48:09 2017 +0200
Bug 19268: Fix TestBuilder parameter in C/Branch.t and K/P/Messaging.t
The values parameter should be called value.
See bug 15339.
Test plan:
Run the adjusted tests.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 62605145932c452bee8e5b6f49ce1b5a75803bd7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 7 13:55:01 2017 -0300
Bug 15339: Remove extra 'my'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8cb6ed24ffb6f7bfa74b7ea4062070cc5cd0e6d2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Sep 7 09:24:28 2017 +0200
Bug 15339: [QA Follow-up] Add a warning too when source is not supplied
When you do not supply a source and add a few wrong parameters, you
would not be warned. Because build simply returns undef.
Adding a carp and a test for that situation too.
Note: In the earlier subtest 'trivial tests' build was called without
source. This now generates a warning. We just catch if there is a warning
and test the actual warning itself later on.
Test plan:
Run t/db_dependent/TestBuilder.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d60cc56613755a432bb0962b2e808229c8c575c1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 6 13:41:47 2017 -0300
Bug 15339: Improve parameter validation
Only value and source are allowed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d53f7607b57d253e7f95bb6c2d699ed3e93c84b1
Author: Martin Persson <xarragon at gmail.com>
Date: Wed Dec 9 11:31:12 2015 +0100
Bug 15339: TestBuilder warnings (tests)
Makes TestBuilder::build() alert the user when unreognized parameters
are passed, which happens when the user supplies the column values
directly, forgetting the 'value' hash.
This patch contains the tests that doubles as a demonstration
of the kind of error the patch is intended to prevent.
Sponsored-By: Halland County Library
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ebd1039bbdb041c7691eaaa2a977af9cd1687d3e
Author: Martin Persson <xarragon at gmail.com>
Date: Tue Dec 8 20:55:01 2015 +0100
Bug 15339: TestBuilder warnings (code)
Makes TestBuilder::build() alert the user when unreognized
parameters are passed, which happens when the user supplies
the column values directly, forgetting the 'value' hash.
This patch holds the code changes. Examples of the kind of
errors that it catches are in the tests (separate patch).
Sponsored-By: Halland County Library
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/XSLT.pm | 6 +-
Koha/Club/Enrollment.pm | 4 +-
Koha/Club/Field.pm | 2 +-
acqui/basket.pl | 2 +-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 129 +----
.../prog/en/includes/catalog-strings.inc | 30 +
.../prog/en/modules/catalogue/ISBDdetail.tt | 29 +-
.../prog/en/modules/catalogue/MARCdetail.tt | 48 +-
.../prog/en/modules/catalogue/advsearch.tt | 52 +-
.../prog/en/modules/catalogue/detail.tt | 606 ++++++++++----------
.../prog/en/modules/catalogue/imageviewer.tt | 42 +-
.../prog/en/modules/catalogue/issuehistory.tt | 30 +-
.../prog/en/modules/catalogue/itemsearch.tt | 476 +++++++--------
.../prog/en/modules/catalogue/labeledMARCdetail.tt | 49 +-
.../prog/en/modules/catalogue/moredetail.tt | 22 +-
.../prog/en/modules/catalogue/search-history.tt | 218 +++----
.../en/modules/course_reserves/course-details.tt | 10 +-
.../prog/en/modules/course_reserves/course.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/catalog.js | 112 ++++
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 20 +-
members/boraccount.pl | 2 +-
members/pay.pl | 11 +-
members/paycollect.pl | 2 +-
opac/sco/sco-main.pl | 15 +-
t/db_dependent/Circulation/Branch.t | 8 +-
t/db_dependent/Koha/Patron/Messages.t | 2 +-
t/db_dependent/TestBuilder.t | 36 +-
t/lib/TestBuilder.pm | 9 +-
28 files changed, 1016 insertions(+), 958 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/catalog.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list