[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-72-g0679425
Git repo owner
gitmaster at git.koha-community.org
Tue Oct 3 11:25:35 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 0679425b29b9bff8c16fff91b7351a2f9f89a045 (commit)
via 68cd7787717a5831ed276fce65cc2845368a7c41 (commit)
via 342786ec9acbebe2aa85481d9f0f273dea8219ad (commit)
via 66c568941bba29efc739f83dc3fb2cfb172d02ea (commit)
via 112116e45f4676aea3a63faa42b0e6a3e2456706 (commit)
via 49d8426f5634aa6433f58ce5830d9f7729605364 (commit)
via 60b6d736ee306198af83e1a1482ff89280a05e7b (commit)
via be1be7d7ec4f0458746b24335e6392851cf53f7b (commit)
via f62992e8120b8ddda5d1ac8cb1b3276617d4dd53 (commit)
from 4b360f1371a56268458b62e5c8c68da853b4e52d (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 0679425b29b9bff8c16fff91b7351a2f9f89a045
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Aug 2 17:12:44 2017 +0100
Bug 19024 Do not unset order cancelled status on basket close
On closing a basket, status is updated to ordered for orders not
completed. However the operation was resetting the status for
cancelled as well as new orders.
While display is correct from the basket view (it checks the
cancellation date). The status in the acquisitions tab from the
catalogue view reverts erroneously to ordered.
This patch adds cancelled to the statuses not updated on basket
close.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 2e9165001f69312255ad1b6706f040784460d5d1)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 68cd7787717a5831ed276fce65cc2845368a7c41
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Aug 15 11:44:12 2017 +0100
Bug 19024 Fix some infelicities of phrasing in test messages
The test messages were awkwardly phrased, re phrase them to
sound more natuaral. Patch is cosmetic (grammar) only
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 16c25a36988b47fb9fcbabd91fdace5f98f9caed)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 342786ec9acbebe2aa85481d9f0f273dea8219ad
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 9 16:09:32 2017 -0300
Bug 19024: Add tests
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 7db6067dc4cc55bee771fedb31e2454b72123ac0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 66c568941bba29efc739f83dc3fb2cfb172d02ea
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 1 16:20:18 2017 -0300
Bug 9857: Fix failing tests
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 49778103ce528ccfc7fcc8be26bcae3b4ae7815b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 112116e45f4676aea3a63faa42b0e6a3e2456706
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Aug 18 08:36:59 2017 +0000
Bug 9857 - Follow-up - Fix for searches with su= or su:
When the initial search is su=.../su:... the links was
not constructed correctly. With this change, it should
be the case.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
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 786deba62beb5a52a543af5415610e14f7d0a8c5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 49d8426f5634aa6433f58ce5830d9f7729605364
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri Dec 4 01:17:50 2015 +0100
Bug 9857: Did you mean? uses wrong punctuation in search links
The link changes the search links generated by the plugins
from an=authid to an:authid, as suggested by Jared on the
bug report.
- Turn on the AuthorityFile und ExplodedTerms plugins
for the OPAC from the "Did you mean" section of the
administration module
- Search a term in your OPAC where one or several
authorities exist.
A last name or a place name might work well.
- Verify that there are suggestions displayed on top of
your result list.
- Verify that the link created is something like:
/cgi-bin/koha/opac-search.pl?q=an=14084
- Apply patch.
- Verify the link has changed a little and still works
correctly:
/cgi-bin/koha/opac-search.pl?q=an:14084
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
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 d0e3891e251a6a11188d70a5480af0e44b8c1fb0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 60b6d736ee306198af83e1a1482ff89280a05e7b
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Wed Jul 12 10:09:48 2017 +1200
Bug 18621: Added in value attribute to dateexpiry field
Test plan:
1. Create a patron category with the dateexpiry value of 29/9/2017
2. Create a patron user from that patron category (which I'll refer to as patron A) with the date
expiry value of 1/10/2017 and submit the form
3. Notice that the manual dateexpiry you have submitted is correctly
displayed
4. Create a duplicate patron with the same firstname and surname and
patron A, and set the date expiry value of 1/10/2017 and submit the form
5. The form displays a duplicate patron message. Notice that the dateexpiry input box is empty now
6. Select the new member (not a duplicate member) option in the
messagebox
7. The form successfully submits and notice that the date expiry value
displayed is that of the patron category (i.e. it is 29/9/2017) not the
dateexpiry value of 1/10/2017 that you manually set for this patron
8. Apply patch
9. Repeat step 4
10. The form displays a duplicate patron message. Notice the dateexpiry input box still
contains the value you entered which is 1/10/2017. Select the new member
(not a duplicate member) option in the messagebox
11. The form successfully submits and notice that the date expiry value
displayed is 1/10/2017 that you manually set for this patron
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
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 515e62992893b72c54a34311088a9442a37d8138)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit be1be7d7ec4f0458746b24335e6392851cf53f7b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Aug 18 00:14:52 2017 +0200
Bug 19129 - Follow-up - Add changes to patron duplicate warning
Adds logic from the previous fix to the brief patron summary
shown when checking a possible patron duplicate.
Bonus: Also fixes missing patron category description there.
To Test:
- Add 2 patrons
- Add a patron with the same surname and firstname as an
existing patron in order to trigger the duplicate message
- Click "View existing patron"
- Verify display is correct when existing patron is
- an organisation
- not an organisation
- Verify that the patron category description shows
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
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 a887aeb2dff4e52f35f1f64bfc267867987cbb53)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f62992e8120b8ddda5d1ac8cb1b3276617d4dd53
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Aug 17 14:51:08 2017 +0000
Bug 19129 - Clean up Details tab for Organisation patrons
Problem: A patron category "I" would cause display problems
on the details in the intranet. This is because the templates
confused patron category "I" with patron type "I" (organisation).
Patch:
- Cleans up variable confusion between categorycode and
categorytype.
- The template contained code to change the labels below
the address to 'Organisational phone:" etc., I have removed
this part as it does not match the edit form anymore.
- Initials, date of birth and gender are still hidden for
organisation - matching the edit form.
Bonus:
- The patron category description was missing on the
right and left side of the details tab. Now it displays.
- Fixes some html issues:
- doubled up class attribute in a tag
- doubled up </li></li>
To test:
- Create 3 patrons
- patron category code doesn't matter, but category type organisation
- patron category code 'I', category type NOT organisation
- patron category code NOT I, category type NOT organisaton
- Check details tab in patron account in staff for all 3
- Verify patron category description shows correctly
- Verify information added to the account displays correctly
(phone numbers, emails, ...)
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
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 82f183c5ea802e3231cb2442cf32474c92bd6ab4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 6 +-
Koha/SuggestionEngine/Plugin/AuthorityFile.pm | 5 +-
Koha/SuggestionEngine/Plugin/ExplodedTerms.pm | 7 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 7 +-
.../prog/en/includes/members-toolbar.inc | 4 +-
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/moremember-brief.tt | 28 +++-----
.../prog/en/modules/members/moremember.tt | 74 +++++++++-----------
members/moremember.pl | 6 +-
t/SuggestionEngine_AuthorityFile.t | 2 +-
t/db_dependent/Acquisition/close_reopen_basket.t | 15 +++-
t/db_dependent/SuggestionEngine_ExplodedTerms.t | 4 +-
12 files changed, 75 insertions(+), 85 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list