[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-109-g2a9dc2e

Tue Oct 10 12:35:13 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, 17.05.x has been updated
       via  2a9dc2e595d916e4fb94948871f665df06b7088b (commit)
       via  b17f7ec7c1c838a2aad84012ae4ee3de5e1b34ed (commit)
       via  e05e8762ad34cf4cc5b6aa1754f99dc6cf3468bf (commit)
       via  e1905b08362472ed94dac09d6f9ff2163b5ddf7a (commit)
       via  9aa24de287b78f98ee22af54e55803e414423964 (commit)
       via  f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5 (commit)
       via  870f562e58c8327565b52d3b10f5a8ed2a000706 (commit)
       via  ae405f61c8d4c04361267b500347a496a2ce7d58 (commit)
       via  11b73c1fa06c870a62640ffa8fd8f8610df5df18 (commit)
       via  e25bb0548d4ee69b9d79567a626fe91487386b71 (commit)
      from  f41157c406219a0709d2ab18148a4f7a881663be (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 2a9dc2e595d916e4fb94948871f665df06b7088b
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Mar 30 04:15:54 2017 +0000

    Bug 18351: Able to delete budget with funds

    To test:
    1) Create a budget, add a fund
    2) Delete budget. Notice this is successful and triggers no warning
    message etc.
    3) Go to Funds. Notice the funds appear as if they are not there
    4) Go into mysql and view the aqbudgetperiods table - notice the funds
    are still there and are now inaccessible.
    5) Apply patch
    6) Create a budget, add a fund
    7) Attempt to delete budget. Notice you can't click Delete button.
    Confirm number of funds in hover message is correct.
    8) Delete fund
    9) Confirm you can now delete budget.

    Sponsored-by: Catalyst IT

    Signed-off-by: Felix Hemme <felix.hemme at thulb.uni-jena.de>

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Some code fixes

    See Comment 5. Ready to test.

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Code fix

    See comment 10.
    Ready for testing.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Prevent deletion from forcing URL

    This patch adds a check in the script for existing funds so that the
    budget cannot be deleted when forcing the URL and has other small fixes.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Bug 18351: [FOLLOW-UP] Prevent deletion if funds are added after clicking 'Delete' and before confirming delete

    Followed test plan and patch works as described.

    Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0ed469525fe16e36663c1f5266568beb5e27672d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b17f7ec7c1c838a2aad84012ae4ee3de5e1b34ed
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>
    (cherry picked from commit b56c19528e332381384639ed347d11508086c547)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e05e8762ad34cf4cc5b6aa1754f99dc6cf3468bf
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>
    (cherry picked from commit ddf494b18f6c422d3654b0a78a63be86f5356065)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e1905b08362472ed94dac09d6f9ff2163b5ddf7a
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>
    (cherry picked from commit 693cc1122b2b96ef2fc176b07371a4608104eaaf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9aa24de287b78f98ee22af54e55803e414423964
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>
    (cherry picked from commit 9ffda7a7bc9f627165954b8272f1bb71c1b2beff)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f1677e56ecf1ea5f0ce2a408f1f11e931639e1d5
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>
    (cherry picked from commit 6ed1513e5fe91772c1720963006bf8f04452416d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 870f562e58c8327565b52d3b10f5a8ed2a000706
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>
    (cherry picked from commit 7aef2f3298b0348c2a3994e344e32e5bc41f1f07)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ae405f61c8d4c04361267b500347a496a2ce7d58
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>
    (cherry picked from commit f55af2fc078a7d6a05238232bc276e6924307179)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 11b73c1fa06c870a62640ffa8fd8f8610df5df18
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 13:14:56 2017 -0300

    Bug 17834: Make translation easier

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0c6538f033f43cde33d186561a93a197467bd9a1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e25bb0548d4ee69b9d79567a626fe91487386b71
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Apr 20 03:12:14 2017 +0000

    Bug 17834: Change library news text for single-branch libraries

    To test:
    1) Log into OPAC, go to home page
    2) Confirm that the text shows as 'RSS feed for (branchname) library
    news' if single-branch library
    3) Confirm text shows as normal for libraries with more than one branch

    Sponsored-by: Catalyst IT

    Signed-off-by: maricris <mlabancia at gmail.com>

    Signed-off-by: anafe <anafeazuela at yahoo.com>

    Signed-off-by: iflora <iflora at unimas.my>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1417f83e8b8a57e70e9120244a36204cf4acb3c2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 acqui/basket.pl                                    |    2 +-
 admin/aqbudgetperiods.pl                           |   30 +++++++++++----
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   40 +++++++++++++-------
 .../en/modules/course_reserves/course-details.tt   |   10 ++---
 .../prog/en/modules/course_reserves/course.tt      |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |   14 ++++++-
 members/boraccount.pl                              |    2 +-
 members/pay.pl                                     |   11 ++++--
 members/paycollect.pl                              |    2 +-
 9 files changed, 78 insertions(+), 35 deletions(-)

hooks/post-receive
-- 
main Koha release repository