[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.04-105-gb415a67
Git repo owner
gitmaster at git.koha-community.org
Thu Apr 25 16:06:42 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, 18.11.x has been updated
via b415a676f1a22b51fc89d35ea459ffa88b908706 (commit)
via 72f0283c582b8f0454aa29771431a688cb437069 (commit)
via d07bbd7c44cd0036f9c66e058d261b4b38a6bcf0 (commit)
via 14bec67add0d82706e6dfb63770fef7de044d643 (commit)
via 6dd0d44e3cfbca24f52c854a66965b9fc2ad1398 (commit)
via bd938e1d9f49f34f641d4ebcd88ef889ca683ca1 (commit)
via ddd6d66f09c8cca419b99ae24bbdd2371ac3da28 (commit)
via 1eae74da5654ad837e72e59077cbe9601217a47f (commit)
via 27209dea6666c490431aa56485771d8e36c0125a (commit)
via f9cd8a272da9f097ba1259a005b636ff0956d286 (commit)
from a1f80ad2950ea100e34260be7ae7d6e7f6f3bea7 (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 b415a676f1a22b51fc89d35ea459ffa88b908706
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Apr 25 14:44:49 2019 +0100
Bug 22069: Make log viewer find item renewals
Without this patch renewals for checkouts wouldn't
show in the log viewer. The log viewre was using
RENEW, which we use for patrons, but for issue
RENEWAL is used.
The patch adds RENEWAL to the search params, when
Renew was selected in the form, so both terms are
included in the query.
To test:
- Make sure you have RenewalLog turned on
- Make a patron renewal
- Check something out and renew it
- Go to Tools > Log viewer and test different
searches
- Modules All - Actions All
- Modules All - Actions Renew
- Modules Circulation - Actions Renew
...
- Make sure results show as expected
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3e7b24e023c7c88eb9b1a30308a537de9dcd8682)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 72f0283c582b8f0454aa29771431a688cb437069
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Apr 11 17:15:51 2019 -0300
Bug 22688: (QA follow-up) Use search_params as all() does
It looks like selected would be passed all the way down to
Koha::Libraries->search and this would fail all the time.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a48d1a43df24a47f1d31cd437a54961934d50230)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d07bbd7c44cd0036f9c66e058d261b4b38a6bcf0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 11 09:52:29 2019 -0400
Bug 22688: TT plugin for pickup locations code wrong
Test Plan:
1) Apply this patch
2) prove t/db_dependent/Koha/Libraries.t
Signed-off-by: Agustín Moyano <agustinmoyano at theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ae18c4bb031a194302ced37f4b376c7439f77c99)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 14bec67add0d82706e6dfb63770fef7de044d643
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Apr 11 17:14:05 2019 -0300
Bug 22688: (follow-up) Unit tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 111068485d455d2020d68a69d29a562547e345c6)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6dd0d44e3cfbca24f52c854a66965b9fc2ad1398
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 11 10:13:58 2019 -0400
Bug 22688: Unit tests
Signed-off-by: Agustín Moyano <agustinmoyano at theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 2c461fc508d6161c3ab60b523bd724eef20870b9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bd938e1d9f49f34f641d4ebcd88ef889ca683ca1
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 13:54:28 2019 +0000
Bug 22451: Use Asset everywhere
Test plan:
Use installer and onboaarding tool, make sure the js and css files are
loaded
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f1c150c98fb60ea75eae7d3b55adbcb7620b7519)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ddd6d66f09c8cca419b99ae24bbdd2371ac3da28
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 13:43:21 2019 +0000
Bug 22451: Update test
Test plan:
prove t/db_dependent/Koha/Template/Plugin/Asset.t
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit be3c2abbdc3410ea0cd7e9aa908329d9b46d8c14)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1eae74da5654ad837e72e59077cbe9601217a47f
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 13:30:20 2019 +0000
Bug 22451: Make Asset plugin use Koha::version instead of version from db
Test plan:
Apply the patch a try to use Koha, css and js files should be used
normally
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4d3461a671f8ad95917aab9ac193cd69fe6c1691)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 27209dea6666c490431aa56485771d8e36c0125a
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Thu Apr 11 10:48:42 2019 +0200
Bug 22652: Editing Course reserves is broken
To test:
1. Create a course reserve or go on an existing one
2. Add items and add a change for the holdingbranch
3. On the list of items in this course reserve
(course_reserves/course-details.pl?course_id=xx), click on "edit" at the
end of a row :
Without the patch, you can't see the holdingbranch you have choose for
this item, but you see "LEAVE UNCHANGED"
With the patch, you can see the holdingbranch you have choose when
adding this item in the course
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois at inLibro.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ba14e9ca7d40af664f7079c6a9f85a85e88fca9a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f9cd8a272da9f097ba1259a005b636ff0956d286
Author: Olivier Crouzet <kohateam at univ-lyon3.fr>
Date: Mon Mar 11 15:00:23 2019 +0100
Bug 20830: Make sure a fund is selected when ordering from a stage file
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 8cb24d65849aa881a0e6eb74271ca2d9c7ea455c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Template/Plugin/Asset.pm | 4 +-
Koha/Template/Plugin/Branches.pm | 9 +-
.../prog/en/includes/installer-doc-head-close.inc | 8 +-
.../prog/en/includes/installer-intranet-bottom.inc | 11 +-
.../intranet-tmpl/prog/en/includes/select2.inc | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 14 ++
.../en/modules/course_reserves/add_items-step2.tt | 2 +-
.../prog/en/modules/onboarding/onboardingstep3.tt | 4 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 +
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
t/db_dependent/Koha/Template/Plugin/Asset.t | 7 +-
t/db_dependent/Template/Plugin/Branches.t | 185 +++++++++++++-------
tools/viewlog.pl | 1 +
13 files changed, 164 insertions(+), 86 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list