[koha-commits] main Koha release repository branch master updated. v17.11.00-1179-g39be847
Git repo owner
gitmaster at git.koha-community.org
Thu Apr 12 17:14:00 CEST 2018
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 39be84754fd5cf4a1bd1f41ed901ad7fa59f8892 (commit)
via c57ecd00ae312ad2464fbabeef9a7f2aa262cba5 (commit)
via 44041681e102c46693c512a34854db195e14997a (commit)
via b44db114211fad704bdf80ae6e8f8471b57477d9 (commit)
via c9e23381f3f1b2b8ab7a3ad70aaf07dba2756c5e (commit)
via a236b684fdae8e0da83ca7263b948da971dfc849 (commit)
via f6155d98e0cf6193efd8224ace68e0755f678df6 (commit)
via e3f69fc1146b341878cacdb9bb6f67b42d84b658 (commit)
via 62c99195157829ce31e87f7b05eb294c297d43b5 (commit)
via b4b558fc2242b0a10e30ad7ec57d2c1f9d66d1f5 (commit)
via dff72d446e7aee4ef5ff180db29a51454625bebe (commit)
via 9e5297efaaf9f5fd55d10e163ba275f4e04562ee (commit)
via db75d5bf035efa92ea0a70956a3abb258283b49c (commit)
via 4ad0a0fd9eecfc26d7456bcb9cf9fd0d6599249a (commit)
via a7df1f9f8eb9ed16246964d94dd8a69b756b6551 (commit)
via 5648b1b45fade82aa4dd5d8df6de7c29a0dd5bd5 (commit)
via 297529c251a13bab5817c0fb4f9dd66708229eb1 (commit)
via 2057bc5ccd52564c846a47031f889c78b4506cd3 (commit)
via 32fc3f9ed14df5cec9e13064c93959fce8dec69c (commit)
via 0ea53c745632e3b45bcad2d2238e4b126a323231 (commit)
via 49933cd449de64f4f546c929641f86550c00812f (commit)
via 420f8b01d4c5420cb6538b75c06c828f90fdaac0 (commit)
via 73c905300646c20a0c3c5bbe1a728cd29602f87f (commit)
via eae628e22d240df705a9b608a778fe6a1b21a586 (commit)
via b2a9c6d540b38039d17636adf9c00c0cd2b0f422 (commit)
via 5bfa57165e1df549a56d661808efcb5144f970ef (commit)
via aa4d328a3bbe1971a3c4aec9adf8468ce4dbb5c8 (commit)
via 4a58a5cca2c1881ac0fdf54c06cab7314d7981e1 (commit)
via f2e9d0d8951ecaffba2f055a4df588468951a09f (commit)
via 031604f59bc92d68a0cc439d4ddc8b6d9a9660f4 (commit)
via 8012cc5ebdd2439791d87c11bce22134d1e76533 (commit)
via c252ab6a878cc97da97739b0fb5434692e12bb4b (commit)
via 36c4d1441d216f25e69fe9bb9e29d92d103a6b45 (commit)
via bebf7d17c9e6b12c5d0abe7253cea26f046311bb (commit)
via 7b1d08df0f4f69c52826c80a13158245287f4c00 (commit)
via 81819184fcff96e71025f1a3be7f653e8f8b822d (commit)
via 5e80f4d81e942d59075fb47906174c00e9220d9c (commit)
via d3efdeb2db89f49b73930cf53cbf2e8e658c3215 (commit)
via a4db544aa5c2994a8e5ff14a8cfaad53e95a217d (commit)
via bd147a38323bb810f85c41134abfc894b0ac8e60 (commit)
via de3a15c0a80fe6946827a80ca8e4ffd64078625e (commit)
via db274061c25c9ec48cf555f54bc63d42ebe546ed (commit)
from e5229fd68b13e69b47349e9b5c986a6243ee69c6 (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 39be84754fd5cf4a1bd1f41ed901ad7fa59f8892
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 10 18:30:09 2018 +0000
Bug 17981: (QA follow-up) Fix and update pod in svc/letters/get
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c57ecd00ae312ad2464fbabeef9a7f2aa262cba5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 11 15:55:04 2018 -0300
Bug 17981: Do not crash if the template is already using TT syntax
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 44041681e102c46693c512a34854db195e14997a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 15 12:50:32 2017 -0300
Bug 17981: Remove uneeded module JS var
As we only support CHECKIN and CHECKOUT for now, we do not need this
module variable. It may be useful to re-add it later.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b44db114211fad704bdf80ae6e8f8471b57477d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 24 17:38:17 2017 +0100
Bug 17981: Move the divs to the top of the modal
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c9e23381f3f1b2b8ab7a3ad70aaf07dba2756c5e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 24 17:13:07 2017 +0100
Bug 17981: Better error handling
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a236b684fdae8e0da83ca7263b948da971dfc849
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 24 13:31:30 2017 +0100
Bug 17981: Add a preview mode for notice templates
This patch is a first step to provide a preview mode for notice
templates.
CHECKIN, CHECKOUT and HOLD_SLIP are supported so far.
Maybe more, but I have not tested yet and the interface will not allow
you to generate the preview.
The idea is to provide an idea of how will render the messages generated
from a notice template.
A new "Preview" button is added close to each textarea on the editing
notice templates view.
For each notice template code (letter_code), we will need some input
data to produce the preview.
For instance, for CHECKIN we need an barcode. From the barcode we
can guess all the other data.
For CHECKOUT we will need the borrowernumber and the barcode.
Note that the way to enter the data for the preview is not really
user-friendly, for CHECKOUT you will have to fill
'borrowernumber|barcode', but the placeholder will help you to know how
and what to fill.
In the modal window, you will see 4 blocks:
1/ the content of the letter (with the placeholds << >>)
2/ the generated message (with the data filled)
3/ if the letter contained historical syntax markers, the screen will
try to generate a notice template using the TT syntax
4/ the generated message from this TT syntax
=> You will be able to compare the 2 generated messages.
What is the goal of this first patchset:
- Show this first POC and get feedback from other developpers
- Add a way to easily visualise the differences between the 2 syntaxes
- Confort users with the TT syntax and the migration step from the
historical syntax.
I'd like to get opinions before going further.
The possibilities:
- Mock data to get fully working generated messages for any notice
templates. For instance, for CHECKIN and CHECKOUT, the item is not
checked in/out yet. So we cannot access the issue's information.
(I have no idea how to do that)
- Browse the data to get the ones we want to use for the preview (big).
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f6155d98e0cf6193efd8224ace68e0755f678df6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 24 11:18:46 2017 +0100
Bug 17981: Add a 'letter' param to GetPreparedLetter
This will allow us to call GetPreparedLetter with a letter content that
does not exist in the DB
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e3f69fc1146b341878cacdb9bb6f67b42d84b658
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 24 10:09:26 2017 +0100
Bug 17981: Move svc/letters to svc/letters/get
To allow another script under svc/letters
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 62c99195157829ce31e87f7b05eb294c297d43b5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 2 12:56:21 2018 -0300
Bug 20426: Fix default fund value when adding orders from iso2709 file
A new bug has been highlighted since:
commit b830349f45007629f141a9835e05b95f90ee4b92
Bug 19453: Incorrect jQuery selector for fund drop down validation
Prior to bug 19453 the check on the existence of the fund did not work
as expected, no select with name='budget_code' existed and the error was
never raised.
Now it works but expect a fund to be selected for every record to
import.
This check must only be done if there is no default value selected.
Test plan:
- Create an order from a staged file
- Do not select any funds
=> You must get a warning
- Select a specific fund for some of the records
=> You must get a warning
- Select a default fund in the last tab
=> You must not get a warning and the records must be imported and
inserted with the correct fund
Signed-off-by: Sonia Bouis <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b4b558fc2242b0a10e30ad7ec57d2c1f9d66d1f5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Apr 11 18:19:58 2018 +0000
Bug 18904: (follow-up) Use Ctrl+Shift+L
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dff72d446e7aee4ef5ff180db29a51454625bebe
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Apr 9 12:55:38 2018 +0200
Bug 18904: (QA follow-up) Do not put authid in searchbox of blinddetail
Adding trivial test if subfield equals 9.
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 9e5297efaaf9f5fd55d10e163ba275f4e04562ee
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 6 12:30:16 2018 +0000
Bug 18904: (follow-up) Rebase onto 14769
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: simplified if-then-else around cur_field.setIndicator[12].
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit db75d5bf035efa92ea0a70956a3abb258283b49c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 15 10:18:54 2018 +0000
Bug 18904: (follow-up) Set indicators and correct js path
TO test:
1 - Have an authority with some indicators
2 - Link a field in rancor to that authority
3 - See that you get some indicators (same in unimarc, diff in marc21)
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 4ad0a0fd9eecfc26d7456bcb9cf9fd0d6599249a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 27 11:17:09 2017 +0000
Bug 18904: Remove debugging code
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 a7df1f9f8eb9ed16246964d94dd8a69b756b6551
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 20 10:23:49 2017 +0000
Bug 18904: (follow-up) Retrieve subfield in the order they are stored
Use subfields in the order they are stored.
This patch removes use of an intermediate hash for storing values. Order
of subfields as obtained from authority is now preserved.
Also removes useless code that was intended to set $2 subfields
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 5648b1b45fade82aa4dd5d8df6de7c29a0dd5bd5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 6 17:49:14 2017 +0000
Bug 18904: (follow-up) Fix whitespace and don't use hardcoded path
Fix whitespace/tabs
use [% interface %] not intranet-tmpl
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 297529c251a13bab5817c0fb4f9dd66708229eb1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 6 16:35:38 2017 +0000
Bug 18904: Advanced editor - Rancor - Add authority support
This patchset adds the ability to use the authorities search to select
or clear fields in the advanced editor
To test:
1 - Open a record in the advanced cataloging editor
2 - Press 'Ctrl+L' while in a field that shuold not be linked to
authorities (300 for instance)
3 - Nothing should happen
4 - Try it in a field that should be linked
5 - You should get the authorities pop-up
6 - Values in pop-up should be populated from values in record (as
appropriate for authority type)
7 - Correct authority type should be selected ( PERSO_NAME for 100,
TOPIC_TERM for 650, etc.)
8 - Press 'Clear', field should be blanked
9 - Search again and select an authority
10 - Field should be correctly populated
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 2057bc5ccd52564c846a47031f889c78b4506cd3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 10 14:50:16 2018 -0300
Bug 14769: DBRev 17.12.00.029
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 32fc3f9ed14df5cec9e13064c93959fce8dec69c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Apr 12 08:54:34 2018 +0200
Bug 14769: (QA follow-up) Remove global var $cached_indicators
As requested by RM, this patch replaces using the global $cached_indicators
by saving state temporarily during the (limited) lifetime of the object.
Essentially this affects two places in code:
[1] blinddetail-biblio-search.pl (loading auth record in editor)
[2] AuthoritiesMarc::merge (merging authority into biblios)
Concurrent runs of [1] and/or [2] together with a simultaneous pref change
just in between could cause slight (hypothetical) side-effects.
The current approach of keeping state in the object makes that a series of
controlled_indicators calls during an immediate merge of one specific
authority is not affected by a simultaneous pref change. So the same rules
are applied to the set of attached biblio record for that authority.
Note also that the cron job ignores a simultaneous pref change, since
it reads from the unchanged L1 cache (yes, also hypothetical).
Test plan:
[1] Run t/Koha/Authority/ControlledIndicators.t
[2] Run t/db_dependent/Authority/Merge.t
[3] Run t/db_dependent/Koha/Authorities.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 0ea53c745632e3b45bcad2d2238e4b126a323231
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 9 12:18:10 2018 +0100
Bug 14769: (Follow-up) Let blinddetail look at indicator values
If the indicators are not controlled, blinddetail should not overwrite
what the user already entered. Very strictly seen, we could say that it
is outside the scope. But it is strongly related.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested with 100 and 600 in the cataloging editor.
For 100 the second indicator should not be overwritten. For 600 it should.
Also tested "ind2:" which should blank ind2.
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 49933cd449de64f4f546c929641f86550c00812f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 9 09:03:26 2018 +0100
Bug 14769: (Follow-up) Reduce number of preference parses
In sub merge the Koha::Authority object was already created, so it was kind
of silly to recreate it each time with new.
In Koha::Authority, the ControlledIndicators object can be saved in the
object too for reuse during its life time. Similarly, we prevent repeated
lookups for the reporting tag (via authority type).
Test plan:
[1] Run t/db_dependent/Authority/Merge.t
[2] Run t/db_dependent/Koha/Authorities.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Limited benchmarking shows me a reduction of 11% on Merge.t and a
reduction of 4% on Authorities.t when comparing with and without this
last patch. The larger impact on Merge.t could be expected.
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 420f8b01d4c5420cb6538b75c06c828f90fdaac0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 26 10:17:33 2018 +0100
Bug 14769: Put ControlledIndicators to work
This patch does:
[1] Adds Koha::Authority->controlled_indicators (with a test).
[2] Adds a call to controlled_indicators in AuthoritiesMarc::merge.
Unit test Merge.t is extended too.
[3] Simplifies the code in authorities/blinddetail-biblio-search.pl by
calling controlled_indicators.
Test plan:
[1] Run t/db_dependent/Koha/Authorities.t
[2] Run t/db_dependent/Authority/Merge.t
[3] Steps 3 to 7 for MARC21:
Create a PERSO_NAME authority with 008/11=r and ind1=3
[4] Edit a biblio and add a 600 linked to the new authority.
[5] Verify that the biblio has ind1==3 and ind2==7 and $2==aat.
(If $2 is not visible, check the metadata in biblio_metadata.)
[6] Edit the PERSO_NAME authority and change 008/11 to '|' (bar).
[7] Verify that merge updated your biblio record: $ind2==4 and $2 gone.
[8] UNIMARC: Follow the pattern from steps 3 to 7.
Create authority, link it in a biblio, check indicators (they should
be copied both). Edit authority, change indicators and verify the
merge results in the biblio record.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested PERSO_NAME and UNIF_TITLE.
For UNIF_TITLE the second authority indicator is copied to ind1 or ind2,
depending on the biblio tag involved.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
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 73c905300646c20a0c3c5bbe1a728cd29602f87f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 8 12:59:08 2018 +0100
Bug 14769: Add preference AuthorityControlledIndicators
Including:
[1] Atomic update to add pref for existing installs
[2] Add new pref to sysprefs.sql for new installs
[3] Add description to authorities preference file.
Test plan:
[1] Run new install or upgrade to add pref.
[2] Check value of pref via System preferences in staff interface.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
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 eae628e22d240df705a9b608a778fe6a1b21a586
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Feb 6 16:47:12 2018 +0100
Bug 14769: Add tests for _thesaurus_info in ControlledIndicators.t
Apart from adding tests for this sub, we make the following change
too and support it with a test.
The fallback to $code in the construction
$thes_mapping{ $code } // $code // '4'
is removed by this patch. When $code is not in $thes_mapping, we cannot
assume that it is a valid code for a biblio indicator. In this case it is
more safe to mark it as 4 (Source not specified).
Test plan:
Run t/Koha/Authority/ControlledIndicators.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
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 b2a9c6d540b38039d17636adf9c00c0cd2b0f422
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Fri Nov 24 22:21:48 2017 +0100
Bug 14769: Biblio indicators based on authority's thesaurus code
Original patch from Janusz Kaczmarek on November 24, 2017.
Amended by Marcel de Rooy on February 6, 2018.
Code moved from AuthoritiesMarc.pm to ControlledIndicators.pm.
Special attention has been paid to the proper application of 008/11
while controlling 6XX in MARC 21, specially if 008/11 =~ /[rsz]/
(and if it is 'z' and 040 $f is defined).
Test plan:
See next patch.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
The construction $thes_mapping{ $code } // $code // '4' will still get
some attention on a follow-up.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
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 5bfa57165e1df549a56d661808efcb5144f970ef
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 26 11:06:59 2018 +0100
Bug 14769: Introduce Koha::Authority::ControlledIndicators
This module reads its settings from pref AuthorityControlledIndicators.
The get method allows you to retrieve indicator values for specific
biblio fields.
Test plan:
Run t/Koha/Authority/ControlledIndicators.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: Added a test to show that "ind1:" returns empty string.
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 aa4d328a3bbe1971a3c4aec9adf8468ce4dbb5c8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 12 10:48:17 2018 -0300
Bug 9701: DBRev 17.12.00.028
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 4a58a5cca2c1881ac0fdf54c06cab7314d7981e1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Apr 9 09:08:59 2018 +0200
Bug 9701: (QA follow-up) DBIx schema changes
Changes in MarcTagStructure.pm
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 f2e9d0d8951ecaffba2f055a4df588468951a09f
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 19 10:36:04 2018 +0000
Bug 9701: (follow-up) Adjust tests
Test plan:
prove t/db_dependent/Biblio.t
should be green
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
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 031604f59bc92d68a0cc439d4ddc8b6d9a9660f4
Author: Joachim Ganseman <joachim.ganseman at student.ua.ac.be>
Date: Sat Jun 4 12:58:36 2016 +0000
Bug 9701: Configure default indicator
This patch adds the possibility to define default indicators in
the MARC frameworks. It adds 2 columns in the marc_tag_structure table in
the database in order to accomplish this. All files that reference this
table have also been updated to reflect these added fields.
Test: Add or edit a MARC framework. In the Field list should be 2 extra
columns. It should be possible to add default indicators (1 character)
in these fields. Nothing else should have changed in the meantime.
The default indicator values are not yet visible in the cataloguing module.
The default values are also loaded in the cataloguing form.
Test: Define default values in some MARC framework. Go to cataloguing
and create a new record using this framework. Verify that the defined
defaults are visible when set. Verify the default is empty (as before)
if no default was set. Verify that if the default is changed, the
record is saved with the manually changed value. Verify that upon
changing such a new record, the manually set indicator value is used
and not the default one from the framework.
Don't forget to run database and database schema update
Signed-off-by: Eugene Jose Espinoza <eugenegf at yahoo.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
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 8012cc5ebdd2439791d87c11bce22134d1e76533
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 23 13:45:09 2018 -0300
Bug 19936: Reuse existing userid if none provided
Found this regression when working on other patches:
If you edit a patron and blank the userid field, it will be regenerated
with an incremented value (firstname.surname will be firstname.surname1)
This is because we use a non-existing patron and ->in_storage in
has_valid_userid is always false.
The trick here is to backup the value, generate the userid, then reset
userid to the previous value.
As the POD says, it will be fix later, when AddMember and ModMember will
be replaced with Koha::Patron->store
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c252ab6a878cc97da97739b0fb5434692e12bb4b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 21 16:10:30 2018 -0300
Bug 19936: Replace Check_userid - Update the occurrences
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 36c4d1441d216f25e69fe9bb9e29d92d103a6b45
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 9 10:33:25 2018 -0300
Bug 19936: Remove warnings from tests
C4::Members did not "use warnings;"
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bebf7d17c9e6b12c5d0abe7253cea26f046311bb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 9 10:27:34 2018 -0300
Bug 19936: Remove the subroutine Generate_Userid
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7b1d08df0f4f69c52826c80a13158245287f4c00
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 18:44:25 2018 -0300
Bug 19936: Replace Generate_Userid - Update the occurrences
Test plan:
Same test plan as previous patch:
add/update/import patrons and watch the userid
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 81819184fcff96e71025f1a3be7f653e8f8b822d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 18:48:49 2018 -0300
Bug 19936: Adapt tests
And prove that we are not cheating
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5e80f4d81e942d59075fb47906174c00e9220d9c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 18:44:56 2018 -0300
Bug 19936: Add the Koha::Patron->generate_userid method
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3efdeb2db89f49b73930cf53cbf2e8e658c3215
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 18:35:58 2018 -0300
Bug 19936: Move and add tests for Generate_Userid
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a4db544aa5c2994a8e5ff14a8cfaad53e95a217d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 18:05:29 2018 -0300
Bug 19936: Remove the subroutine Check_Userid
It is no longer in user, we can remove it.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bd147a38323bb810f85c41134abfc894b0ac8e60
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 18:04:56 2018 -0300
Bug 19936: Replace Check_userid - Update the occurrences
We previously prove that the method and the subroutine were equivalent,
we know update the controller calls.
Test plan:
- Add and update a patron with different variations of userid
(automatically generated or not)
- Import patrons with and without userid, as well as with existing
userid
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit de3a15c0a80fe6946827a80ca8e4ffd64078625e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 17:50:48 2018 -0300
Bug 19936: Add the Koha::Patron->has_valid_userid method
Reuse how C4::Members::Check_Userid works and adapt it to write
Koha::Patron->check_userid
Adapt the tests to use this new method.
The tests still pass, we can adapt the different callers
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit db274061c25c9ec48cf555f54bc63d42ebe546ed
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 8 17:14:49 2018 -0300
Bug 19936: Replace Check_userid - just move the tests
This patch moves the tests related to Check_userid out of Members.t
The tests must pass with only this patch applied
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 14 +-
C4/Biblio.pm | 8 +-
C4/Letters.pm | 26 +-
C4/Members.pm | 70 +-----
Koha.pm | 2 +-
Koha/Authority.pm | 55 +++++
Koha/Authority/ControlledIndicators.pm | 154 ++++++++++++
Koha/Patron.pm | 77 ++++++
Koha/Patrons/Import.pm | 26 +-
Koha/Schema/Result/MarcTagStructure.pm | 22 +-
admin/marctagstructure.pl | 28 ++-
authorities/blinddetail-biblio-search.pl | 83 ++-----
cataloguing/addbiblio.pl | 4 +-
cataloguing/editor.pl | 4 +
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 76 +++++-
.../lib/koha/cateditor/marc-editor.js | 25 ++
.../prog/en/includes/cateditor-ui.inc | 8 +
.../prog/en/modules/acqui/addorderiso2709.tt | 22 +-
.../prog/en/modules/admin/marctagstructure.tt | 12 +
.../en/modules/admin/preferences/authorities.pref | 7 +
.../authorities/blinddetail-biblio-search.tt | 47 +++-
.../prog/en/modules/cataloguing/editor.tt | 5 +
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 92 ++++++-
.../prog/en/modules/tools/preview_letter.tt | 57 +++++
members/memberentry.pl | 15 +-
svc/{letters => letters/get} | 12 +-
svc/letters/preview | 250 ++++++++++++++++++++
t/Koha/Authority/ControlledIndicators.t | 122 ++++++++++
t/db_dependent/Authority/Merge.t | 39 ++-
t/db_dependent/Biblio.t | 6 +-
t/db_dependent/Koha/Authorities.t | 35 ++-
t/db_dependent/Koha/Patrons.t | 119 +++++++++-
t/db_dependent/Members.t | 40 +---
tools/letter.pl | 4 +
36 files changed, 1330 insertions(+), 239 deletions(-)
create mode 100644 Koha/Authority/ControlledIndicators.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
rename svc/{letters => letters/get} (91%)
create mode 100644 svc/letters/preview
create mode 100644 t/Koha/Authority/ControlledIndicators.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list