[koha-commits] main Koha release repository branch master updated. v17.05.00-586-g5400795
Git repo owner
gitmaster at git.koha-community.org
Tue Sep 12 17:13:10 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 5400795a6651adc021801052fa0186747983b587 (commit)
via 6eebfe5fe02be3c2ab3285b58cf50fac980cb302 (commit)
via 4efe251f353cb9eddd302b6214e1f4392620b395 (commit)
via 3d07449358010392b111a674c3606cdfe2cbe47e (commit)
via d0c372c5fa0e867d346b342ae470b31c33d52b26 (commit)
via 87773a6d661f122a52b34f6c67255424c335e297 (commit)
via 434162c1756b16b5fc715fd1cb762aaf8aff7b2b (commit)
via db35492c795540d6c3b10f7cba18698aeb84a816 (commit)
via 3e631f418a3fafa485b650f0975ee0d06e366884 (commit)
via dc60c344768540c5e02c8e46e8ae43f7921d252a (commit)
via 562435e767c99670dd9fb8935a2ed483b7a61930 (commit)
via ac653bc7cec4e2ca1f8653efff4a9c44f4255540 (commit)
via f45fc4d10b84dfbd8040d12484553db8c87ec45a (commit)
via 15dee475180ac362e182e1708d1c8b1b1e25e635 (commit)
via ca8f8b4cd91fac4acb6e2338720b8e0a82bce0b0 (commit)
via 7e222bb0796196f1e466b73d909fd28d529cab75 (commit)
via 35e3de845c591958d66c6602940453f2a803a7ee (commit)
via f8502b0d197bab4b4966e9e02253d30f7fcf29f8 (commit)
via 99e691feee5ef29bbc9d24a916fc4aa2fab6bba6 (commit)
via 6ae69d27815dc01ab515b6d8f0239ef5fe59251c (commit)
via 5a64723e6d3d21b3e0d9302b273b6fbb43c969af (commit)
via 0ed469525fe16e36663c1f5266568beb5e27672d (commit)
via 133e25c56ac79e0b88b89e3b749df338e63a93d0 (commit)
via 4d223bdc6156fab0667867f3990854fddfab5684 (commit)
via 889fabe9f28f3b6ef35fc36e73b12652f258510c (commit)
from b4653629f63d410326036cef5aa8a70c55d17f45 (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 5400795a6651adc021801052fa0186747983b587
Author: Dominic Pichette <dominic at inlibro.com>
Date: Tue Sep 12 10:13:58 2017 -0400
Bug 18584 - removed white space in C4/Accounts.pm
Test Plan:
1-go to C4/Accounts.pm
2-there should not be a trailing space at line 279.
Signed-off-by: Dominic Pichette <dominic at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6eebfe5fe02be3c2ab3285b58cf50fac980cb302
Author: Jon Knight <J.P.Knight at lboro.ac.uk>
Date: Mon Aug 21 15:04:20 2017 +0000
Bug 19068: Add quantity field to the opac suggestions form
This enhancement just exposes the quantity field to the OPAC suggestions
form to permit the end user to enter this if they wish. The librarians
can of course override this quantity when they process the suggestion.
Test Plan (assuming using kohadevbox VM):
1) apply patch and turn on purchase suggestions
2) Go to http://localhost:8080/cgi-bin/koha/opac-suggestions.pl?op=add
and notice that there is now a quantity field available.
3) Make a purchasing suggestion using this form, including a quantity.
4) Log in as a member of library staff and go to Home › Acquisitions ›
Suggestions
5) Confirm that the previously entered suggestion is there, and that the
correct quantity appears in the "Acquisition information" section.
6) Edit the purchasing suggestion, change the quantity, save it and
check that the new quantity appears in the suggestion.
I've popped an ID attribute of "opac-suggestion-quantity" to the
surrounding <li> so that CSS can easily make this optional field
disappear (as suggested by cait on IRC).
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4efe251f353cb9eddd302b6214e1f4392620b395
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 6 11:23:10 2017 -0300
Bug 12346: Display the correct number of pending patron modifications on the patron module home page
Due to the way members-home.pl handles the variable $branch, the number
of patron modifications listed on members-home.pl may differ from the
number listed on mainpage.pl. When the librarian clicks this link, he or
she may see a different number than was listed, or none at all!
Test Plan:
0) Set IndependentBranchesPatronModifications = Yes
1) Create a number of modification request for BranchA
2) Log into the staff intranet with a patron without superlibrarian
permissions and set your branch to BranchB
3) Note the modifications alert to does not display on mainpage.pl
4) Click the "Patrons" link to take you to members-home.pl
5) Note the modifictions alert does display on this page
6) Apply this patch
7) Reload members-home.pl, note the alert no longer displays
QA notes: What was the point of the branch variable?
Followed test plan, patch worked as described. Also passed QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3d07449358010392b111a674c3606cdfe2cbe47e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 1 14:39:25 2017 +0000
Bug 17380: [QA Follow-up] Report error to user instead of throwing exception
Internal server errors are good, user feedback is better.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tiny change: removed the obsolete 'use Koha::Exceptions'.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d0c372c5fa0e867d346b342ae470b31c33d52b26
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Sep 1 14:39:03 2017 +0000
Bug 17380: (QA followup) Fix parameter in 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>
commit 87773a6d661f122a52b34f6c67255424c335e297
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jun 26 12:51:59 2017 +0200
Bug 17380: Do not allow Default template in merge form
This patch makes the following changes:
[1] Removes Default from the template list. We should not merge with the
Default framework, since it does not have a reporting tag.
[2] Rearranges the error section in the template. It is confusing to have
two error sections in this template. The error CANNOT_MOVE is not used.
The error FRAMEWORK_NOT_SELECTED is replaced by WRONG_FRAMEWORK.
[3] Do not allow to merge a record with itself.
[4] Check if the merge reference record still contains any MARC tags.
[5] Additional polishing: Simplify passing frameworks to template. Remove
an unused Koha::Authority::Types->search. Remove obsolete POD header
for functions from the script.
Test plan:
[1] Select two authorities to merge. Verify that you cannot select Default
anymore as framework for the reference record.
[2] Reproduce error WRONG_COUNT by adding another authid=999 in the URL
after you selected two authority records for merging.
[3] Remove the third authid from the URL and change the first or second
authid into an unexisting record id. You should generate an Internal
Server Error. The log should show the exception message.
[4] Merge two authorities. Deselect all MARC tags. Should trigger the
error EMPTY_MARC in the template.
[5] Select the same authority record twice for merging. Should trigger the
error DESTRUCTIVE_MERGE in the template.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 434162c1756b16b5fc715fd1cb762aaf8aff7b2b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jul 4 14:31:21 2017 +0200
Bug 17380: Graceful resolution of missing reporting tag in merge
Altough this patch deals with a mostly hypothetical case and this report
makes it practically impossible anymore to merge with records in the
Default framework (having no reporting tag), we can make the code of
sub merge still a bit more robust here.
If you would merge biblio records from one authtype to another and the new
framework would not have a reporting tag, before this patch the result would
be data loss. Merge would handle this request as a delete. This patch makes
merge handle it differently: instead of clearing the biblio records, it
keeps $a and $9 in order to make a future corrective merge possible.
Note: The additional condition on line 1468 for $tags_using_authtype
makes sure that we do not select all fields when the authtype should
unexpectedly be empty string (Default). This prevents crashing on
a "Control fields do not have subfields" error.
Test plan:
[1] Run t/db_dependent/Authorities/Merge.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit db35492c795540d6c3b10f7cba18698aeb84a816
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jun 26 13:41:56 2017 +0200
Bug 17380: Do not use GuessAuthTypeCode in MetadataRecord::Authority
If we got an authtypecode from the database and this value is not NULL
since the table column does not allow it, there is no need to call
GuessAuthTypeCode for empty string (read: Default framework) in the
sub get_from_authid.
Furthermore, we remove three Koha::MetadataRecord::Authority->new calls.
They are useless, since we do not pass a record. It just generates:
No record passed at authorities/merge.pl line 96.
Can't bless non-reference value at Koha/MetadataRecord/Authority.pm line 66.
Instead we throw an ObjectNotFound exception.
Test plan:
[1] Run t/db_dependent/Koha_Authority.t
[2] Interface will be tested in the following patches.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3e631f418a3fafa485b650f0975ee0d06e366884
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 23 10:02:57 2017 +0100
Bug 17380: Add some checks around Authorities::Types->find
Resolves:
Use of uninitialized value $biblio_fields in scalar chop at authorities/detail.pl line 212.
Can't call method "authtypetext" on an undefined value at authorities/detail.pl line 216.
Can't call method "authtypecode" on an undefined value at authorities/detail.pl line 180.
NOTE: Some of these problems have actually been resolved now by bugs 18801
and 18811, but it is still better imo to have these checks.
Test plan:
[1] Verify unchanged behavior. Search for some authorities on authorities.pl
and click on the details of a record.
[2] Open an authorities detail page and change the authid in the URL to a
not existing number. Instead of an internal server error, you should see
a message like "The authority record you requested does not exist".
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dc60c344768540c5e02c8e46e8ae43f7921d252a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 12 12:04:50 2017 -0300
Bug 18811: DBRev 17.05.00.006
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 562435e767c99670dd9fb8935a2ed483b7a61930
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 4 09:27:09 2017 +0200
Bug 18811: [QA Follow-up] Resolved POD warnings
Trivial changes to silence qa tools on POD warnings for Subfields and Tags.
Note: Since Subfield and Tag only contain one sub which is considered as
private by Pod::Coverage, these modules are listed as unrated (no public
symbols defined) and trigger a FAIL on pod coverage in qa tools. This fail
can be ignored.
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 ac653bc7cec4e2ca1f8653efff4a9c44f4255540
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 4 09:19:01 2017 +0200
Bug 18811: [QA Follow-up] Add tests for Koha::Authority::Subfields/Tags
Renaming t/db_dependent/Authorities to Authority
Adding Subfields.t and Tags.t
Test plan:
[1] prove t/db_dependent/Authority
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 f45fc4d10b84dfbd8040d12484553db8c87ec45a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jun 23 07:59:04 2017 +0200
Bug 18811: Atomic update to print warning at upgrade time
The warning encourages people to run the auth_show_hidden_data script
to check for data in hidden fields and adjust their frameworks.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 15dee475180ac362e182e1708d1c8b1b1e25e635
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 22 15:39:41 2017 +0200
Bug 18811: Add a script for checking authority data in hidden fields
If you edit an authority record while having data in hidden fields or
subfields, that data will be lost now.
This script can help you to unhide some fields and prevent data loss.
Test plan:
[1] Add a PERSO_NAME record. Fill e.g. 100b.
[2] Hide 100b in the PERSO_NAME framework.
[3] Run auth_show_hidden_data.pl and verify that it reports 100b in
the PERSO_NAME framework.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ca8f8b4cd91fac4acb6e2338720b8e0a82bce0b0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 22 13:42:38 2017 +0200
Bug 18811: Add Koha Objects for authority tags and subfields
Trivial copy and paste activity.
Will be used in a later patch.
No test plan needed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7e222bb0796196f1e466b73d909fd28d529cab75
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 15 12:30:27 2017 +0200
Bug 18811: Change visibility checks in authorities.pl
The check is now <=-4 or >=5, but the framework uses 0 for Show all and
-5 for Hide all. (Note that sql installer scripts also use 8.)
When modifying an authority, the script also showed hidden fields when
filled, since it did not check the hidden field but only the tab field.
NOTE: The proposed solution restores consistency, but will remove hidden
fields from the MARC record.
Test plan:
[1] Set field 942a to Show all in an authority framework.
[2] Open a new record in this framework and verify that you see 942a.
[3] Edit an existing record in this framework and verify again.
[4] Set field 942a now to Hide all in this framework.
[5] Open a new record in this framework and verify that 942a is hidden.
[6] Edit an existing record in this framework and verify again.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 35e3de845c591958d66c6602940453f2a803a7ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 6 10:42:28 2017 -0300
Bug 19262: Remove xt/author/pod_spell.t
If you run `prove xt/author/pod_spell.t` without having Test::Spelling installed, it will skip the tests.
If you install the lib-test-spelling-perl, the test will fail:
xt/author/pod_spell.t .. You said to run 0 tests at xt/author/pod_spell.t line 21.
xt/author/pod_spell.t .. Dubious, test returned 25 (wstat 6400, 0x1900)
No subtests run
This is because the call to all_pod_files_spelling_ok is expecting a path
If we try to fix it with adding "." as parameter, the tests will raise tone of errors.
Let's remove this file
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f8502b0d197bab4b4966e9e02253d30f7fcf29f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 31 11:47:11 2017 -0300
Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t
The number of tests on jenkins is sometimes confusing:
https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/
shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than
the previous run. However 124 files have not been removed from the
codebase!
I suggest to count only 1 test for all files.
Moreover files from blib and cover_db are counted, they should be
excluded.
Test plan:
prove t/00-merge-conflict-markers.t
must return green
echo ">>>>>>>" >> mainpage.pl
and run the test again
It should now fail
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Works as advertised.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 99e691feee5ef29bbc9d24a916fc4aa2fab6bba6
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Sep 1 13:16:43 2017 -0400
Bug 19235: Password entry visible in OPAC Self-registration
The HTML code was "text" instead of "password".
TEST PLAN
----------
1) 'Allow' PatronSelfRegistration system preference
2) Define the PatronSelfRegistrationDefaultCategory system preference (e.g. PT)
3) Open OPAC
4) Click 'Register here' on the right. (/cgi-bin/koha/opac-memberentry.pl)
5) Scroll to bottom
6) enter some passwords
-- visible
7) apply this patch
8) refresh page
9) repeat 5-6 as needed
-- passwords should not be visible while entering
10) run koha qa test tools
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6ae69d27815dc01ab515b6d8f0239ef5fe59251c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 8 09:41:21 2017 -0300
Bug 19277: Make sure the tests will pass even if they are slow
This patch was my first attempt to fix the issue.
I think it is good to have it, if issue.timestamp and issue.issuedate are the same,
the result will be orderd by issue_id.
The tests highlight the fact that checkouts must be displayed in the
correct order.
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5a64723e6d3d21b3e0d9302b273b6fbb43c969af
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 8 09:38:28 2017 -0300
Bug 19277: TT syntax - Display ordered data
This issue has been highlighted by a failing test: ISSUESLIP displays checkouts in random order
I thought it was because of dates comparison, but it comes from the following line in C4::Letters::_get_tt_params
my $objects = $module->search( { $key => { -in => $values } } );
The DBMS will return data like there is ordered in the DB.
For instance:
select borrowernumber from borrowers where borrowernumber in (5, 3, 1);
or
select borrowernumber from borrowers where borrowernumber=5 or borrowernumber=3 or borrowernumber=1;
will return 1, 3, 5
I did not find a generic way to do that, so used "ORDER BY FIELD" which will not be portable.
Test plan:
If you do not apply this patch, the tests will sometime fail
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0ed469525fe16e36663c1f5266568beb5e27672d
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>
commit 133e25c56ac79e0b88b89e3b749df338e63a93d0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 8 10:14:10 2017 +0200
Bug 15438: [QA Follow-up] Moving POD statement for CanBookBeIssued
The statement for head3 NB ('nota bene'?) looks like a hash key
in the list of possible return values for $needsconfirmation.
Moved it up and prefixed it with IMPORTANT.
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 4d223bdc6156fab0667867f3990854fddfab5684
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Aug 24 13:52:52 2016 +0100
Bug 15438 - Checking out an on-hold item sends holder's borrowernumber in AF (screen message) field.
The returns from C4::Circulation::CanBookBeIssued used
to be structured as a hashref of entries like
REASON => {
data => 'foo',
moredata => 'bar',
};
Some entries still are. But many are now
REASON => 1,
data => 'foo',
moredata => 'bar',
The sip Checkout routine still assumed the former, as it
reports any causes it was not aware of (to maintain support for
a changing api) The data fields could leak into the screen message
field of the response. e.g. the borrowernumber or surname of the
borrower who has a hold on an issued title. Some real messages were
getting obscured by this
This patch sanatizes the return from from CanBookBeIssued
by removing keys which are not all uppercase
It also fixes a case where the key's data element was used
for the screen message when we should use the key itself
Updated the documentation of CanBookBeIssued to flag up
the assumption re case and the fact that 3 elements rather
than two may be returned
The loop through the returned keys was a bit bogus
so we now explicitly jump out if noerror is unset
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested quite extensively. Test results put on Bugzilla.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 889fabe9f28f3b6ef35fc36e73b12652f258510c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Sep 12 14:57:25 2017 +0200
Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
Followup correcting a typo of previous patch :
name="holdingbranch" options = branche
it is branche[s]
Test plan :
- Look at 'Current location' in item search
=> Without patch you see only 'All libraries'
=> With patch you see 'All libraries' and each existing library, like in 'Home library'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 2 +-
C4/AuthoritiesMarc.pm | 14 ++-
C4/Circulation.pm | 8 +-
C4/Letters.pm | 13 +-
C4/Members.pm | 9 +-
C4/SIP/ILS/Transaction/Checkout.pm | 42 +++++--
Koha.pm | 2 +-
Koha/{Biblioitem.pm => Authority/Subfield.pm} | 10 +-
Koha/{Biblioitems.pm => Authority/Subfields.pm} | 18 +--
Koha/{City.pm => Authority/Tag.pm} | 10 +-
Koha/{Biblioitems.pm => Authority/Tags.pm} | 18 +--
Koha/MetadataRecord/Authority.pm | 7 --
admin/aqbudgetperiods.pl | 30 +++--
authorities/authorities.pl | 14 +--
authorities/detail.pl | 8 +-
authorities/merge.pl | 86 ++++++++------
installer/data/mysql/updatedatabase.pl | 9 ++
.../prog/en/modules/admin/aqbudgetperiods.tt | 40 +++++--
.../prog/en/modules/authorities/merge.tt | 60 ++++------
.../prog/en/modules/catalogue/itemsearch.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 8 +-
.../bootstrap/en/modules/opac-suggestions.tt | 1 +
members/members-home.pl | 14 ++-
misc/maintenance/auth_show_hidden_data.pl | 124 ++++++++++++++++++++
t/00-merge-conflict-markers.t | 17 ++-
t/db_dependent/{Authorities => Authority}/Merge.t | 33 +++++-
.../{Authorities => Authority}/MergeRequests.t | 0
t/db_dependent/Authority/Subfields.t | 49 ++++++++
t/db_dependent/Authority/Tags.t | 48 ++++++++
t/db_dependent/Letters/TemplateToolkit.t | 14 ++-
xt/author/pod_spell.t | 22 ----
31 files changed, 517 insertions(+), 215 deletions(-)
copy Koha/{Biblioitem.pm => Authority/Subfield.pm} (86%)
copy Koha/{Biblioitems.pm => Authority/Subfields.pm} (78%)
copy Koha/{City.pm => Authority/Tag.pm} (87%)
copy Koha/{Biblioitems.pm => Authority/Tags.pm} (80%)
create mode 100755 misc/maintenance/auth_show_hidden_data.pl
rename t/db_dependent/{Authorities => Authority}/Merge.t (93%)
rename t/db_dependent/{Authorities => Authority}/MergeRequests.t (100%)
create mode 100644 t/db_dependent/Authority/Subfields.t
create mode 100644 t/db_dependent/Authority/Tags.t
delete mode 100644 xt/author/pod_spell.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list