[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-15-g97f41c8
Git repo owner
gitmaster at git.koha-community.org
Mon Feb 25 14:57:37 CET 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 97f41c827fe57b92319871c23e8291bad3f2dd3a (commit)
via ceb74447df18d1fc8dc05b6142a10085d3a67420 (commit)
via 02179a9f0543a71489371abf95193d85b2aa5489 (commit)
via 1e65ab6f7fe986979efedea4577f29b8c1e3723e (commit)
via 620d3df46204f34c7e4adebdb95f3e1086bd3ce8 (commit)
via 185dd71db731fa164810b3dbea38fc08ee1bed68 (commit)
via 189b33d1ea1592ff680534072f0cf7b3860079aa (commit)
via e7201d27af1ca0c83ba66b69b4836c21b4905dda (commit)
via 52ed732c42b5b3527bed458b8ce4be8878ed507d (commit)
via 4f531c88ae012796e59f576d1aa94f5a323b1800 (commit)
via 2519b3310f645554e1f2175535255dfb79766c41 (commit)
from eae99688acc0e9aff6be0d6b815c6f443f165a65 (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 97f41c827fe57b92319871c23e8291bad3f2dd3a
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Fri Jan 4 11:42:08 2019 +0000
Bug 10676: Add unit tests - GetItemsInfo
To test:
prove t/db_dependent/Items.t
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4e139a237b874df5fcd2169abba75eb3745239f5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ceb74447df18d1fc8dc05b6142a10085d3a67420
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Fri Jan 4 10:11:03 2019 +0000
Bug 10676: Fix behaviour of OpacHiddenItems for items.restricted
The numerical restricted value was overwritten in GetItemsInfo
with the description. So OpacHiddenItems would only work for
restricted using the description, not the numerical value
of the authorised value like for other similar status fields.
This changes GetItemsInfo to use a separate variable for
the description, as it's already done for notforloan and
changes the template files where the variable is used
accordingly.
To test
- Before applying patch
- Configure OpacHiddenItems with:
restricted: [1]
- Find a record with more than one item and mark one of the items
as "Restricted Access"
(assume standard sample data - check authorised value if status doesn't exist)
- Verify the item is still shown in OPAC.
- Apply patch
- Verify that the item is now hidden
- Verify that the status still displays nicely in the staff detail page
- Delete OpacHiddenItems
- Verify that the status is showing nicely in the OPAC detail page
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 39d2885d1330afe825e1881f5fc8033d459f6006)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 02179a9f0543a71489371abf95193d85b2aa5489
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 7 13:11:35 2019 +0000
Bug 22287: Correct new charts CSS
This patch reverts some changes to reports CSS from Bug 22168 which were
unnecessary and which adversely affected the report add/edit form
styling.
To test, apply the patch and clear your browser cache if necessary.
Go to Reports -> Saved reports and repeat the test plan for Bug 22168:
- Run a report which returns more than one column.
- On the report results page, click the "Create chart" button. The chart
settings form should appear in a modal window.
- Click the "Draw" button. The modal should disappear and the chart
should be shown.
Then test the process for adding or editing an SQL report. The form
should be styled in a way consistent with other forms in the staff
client.
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 040c5439c020c34702d1161f12bdc3792d5172f4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1e65ab6f7fe986979efedea4577f29b8c1e3723e
Author: Magnus Enger <magnus at libriotech.no>
Date: Mon Feb 11 11:07:21 2019 +0100
Bug 12488: Make bulkmarcimport.pl -d use DELETE instead of TRUNCATE
On MySQL >= 5.5 bulkmarcimport.pl with the -d (delete) switch gives
an error like "Cannot truncate a table referenced in a foreign
key constraint". This patch proposes to replace the offending
TRUNCATE with DELETE. Auto incerement counters are reset to 1 to
preserve the functionality from TRUNCATE.
To test:
- Make sure you havae a test database with some records and items
- Run bulkmarcimport.pl with the -d switch
- Observe the error described above
- Apply this patch
- Run bulkmarcimport.pl with the -d switch again
- Observe the lack of an error
- Verify that the newly imported records and items have biblionumber
and itemnumbers starting with 1
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit b7b4694666657f57aaf61d091ed34c9f754a11e3)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 620d3df46204f34c7e4adebdb95f3e1086bd3ce8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 15 10:06:33 2019 +0000
Bug 19832: (QA follow-up) Remove obsolete pending_queue call
Only use of $pending was removed in the former patch.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 012200fbc0e3684be312cad055dc583c30a1131d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 185dd71db731fa164810b3dbea38fc08ee1bed68
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 16 13:19:45 2019 +0000
Bug 19832: Don't fill holds in SIP/Transaction/Checkout.pm
AddIssue already checks for holds in the item being issued and deals with them
The sip code, additionally, does not consider that multiple holds per bib
is allowed
To test:
0 - Apply only first patch (unit tests)
1 - Place two holds for a patron on a bib
2 - Checkout that item via sip_cli_emulator
3 - Note all holds are cancelled/filled
4 - prove -v t/db_dependent/SIP/Transaction.t
5 - it fails
6 - Apply second patch
7 - prove tests, all green
8 - Place two holds on a single bib for one patron again
9 - Checkout the item via sip_cli_emulator
10 - Only one holds is filled
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c3b41cb12465249cc87ed8866855e06e61842872)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 189b33d1ea1592ff680534072f0cf7b3860079aa
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 16 13:19:31 2019 +0000
Bug 19832: Unit tests
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: maxissueqty => 10.
Replaced dot by comma.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 50fd86d42fa76b3840c61ea004d026d4810bc4dc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e7201d27af1ca0c83ba66b69b4836c21b4905dda
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jan 3 20:52:15 2019 +0000
Bug 22067: Return if no patron passed to can_see_patron_infos
To test:
1 - Find an adult patron
2 - Add a child to their account
3 - Delete the parent from the db
4 - Attempt to edit the child record
5 - Apply patch
6 - Repeat
7 - Note you can edit the child account
8 - Note guarantor id is not a link
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
No blocker for me, but we are a bit hiding that guarantorid probably should
be a foreign key cleared to NULL at deletion time.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5324268e099ead7a6864d16bae0f051444a1d34e)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 52ed732c42b5b3527bed458b8ce4be8878ed507d
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Feb 6 16:10:07 2019 +0100
Bug 22140: Larger unit test for get_hostitemnumbers_of
Add syspref EasyAnalyticalRecords impact in unit test for get_hostitemnumbers_of
Test plan :
Run t/db_dependent/Items.t
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0da1090d3a21f9ee596500477504be476bed8af7)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4f531c88ae012796e59f576d1aa94f5a323b1800
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Feb 6 15:03:01 2019 +0100
Bug 22140: Use of EasyAnalyticalRecords pref is get_hostitemnumbers_of
Like Bug 20702 defined GetHostItemsInfo does nothing if EasyAnalyticalRecords pref is disabled, get_hostitemnumbers_of must be dependant on this pref too.
Test plan :
1) Build an analytical record with 773$0 and $9
2) Enable EasyAnalyticalRecords
4) Place an hold on the record
5) => You see the linked item
6) Disable EasyAnalyticalRecords
7) Place an hold on the record
8) => You dont see the linked item
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 12fe392d26fda1559f5690a71330a93ffc72a6b7)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2519b3310f645554e1f2175535255dfb79766c41
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jan 16 13:32:35 2019 +0100
Bug 22140: Use of EasyAnalyticalRecords pref in search
Like Bug 20702 defined GetHostItemsInfo does nothing if EasyAnalyticalRecords pref is disabled, there are other places where code must be dependant on this pref.
Test plan :
1) Build an analitical record with 773$0 and $9
2) Enable EasyAnalyticalRecords
3) Don't apply patch
4) Go to OPAC
5) Perform a search that displays the record, check there is the linked item
6) Open record detail page, check there is the linked item
7) Apply patch and redo 5) and 6)
8) Disable EasyAnalyticalRecords
9) redo 5) and 6), you should not see the linked item
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7266d50dd2725c87acf889aa7d6a211999ca1c47)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 10 ++-
C4/SIP/ILS/Transaction/Checkout.pm | 10 ---
C4/Search.pm | 45 +++++++------
Koha/Patron.pm | 1 +
koha-tmpl/intranet-tmpl/prog/css/reports.css | 16 ++---
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../bootstrap/en/includes/item-status.inc | 10 +--
misc/migration_tools/bulkmarcimport.pl | 9 ++-
opac/opac-detail.pl | 31 ++++-----
t/db_dependent/Items.t | 55 +++++++++++++---
t/db_dependent/SIP/Transaction.t | 68 +++++++++++++++++++-
11 files changed, 178 insertions(+), 79 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list