[koha-commits] main Koha release repository branch master updated. v20.05.00-202-gd11e16aec7
Git repo owner
gitmaster at git.koha-community.org
Mon Jun 29 14:17:58 CEST 2020
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 d11e16aec74ad694bd56ce3810954091b0bf1259 (commit)
via cb09303e11b11de2b25852a707211a054fb2b8e1 (commit)
via 5eebfcf68747b4886b23a9d4c8df37ea7d103edb (commit)
via b48162f1be1853a89e0ffc898bc0927edef93f95 (commit)
via eb8a0ffcc1bb4d751daa4221bd37faa815904db8 (commit)
via b9ba7151667bc6481bc97335b94e44487c9701bd (commit)
via 61aa3f794240443f5c2c99adc016f0d80c7251d9 (commit)
via b9e526a12fb338736e149934526e38da782f048f (commit)
via e968af43777d47c9134ea1875270af9661ef2f5a (commit)
via 1682341b5849c34e59597cda780d4c877d6f3278 (commit)
via b168f4a2e9a03ed56ce857353d4dde940980caba (commit)
via 9d890c7636ef1d6ec0a1de2161906fd9f4375e97 (commit)
via 1cab6e03b35ef96ebd520e4b3b314381b85c5eda (commit)
via 281c93ed03ceede3914a7bbdd28ef4e8bfc339be (commit)
via 9391d3b263c324f096bbc75a62aa584753351a46 (commit)
via a2207a080beaa6606e598ae9ee9e1f772e1784ce (commit)
via dd7490c8080e3b90c28c088568a2c4183e7deed3 (commit)
via 30e5985aa1babc2f5c9ab2bc7c00e99c12a0d815 (commit)
via 507f48a438ad2e5bb9000027f2a6081e76108adb (commit)
via 62a6ed54bbb77f5512293255fe9be7548724c556 (commit)
via 2cc3d05d267bae41ba30473f23fe59950da6aeb3 (commit)
via 029f41a667da8f054633432997bc818c1b26a27f (commit)
via d3036d46ba4b26df040a25f960c3bc3081734c26 (commit)
via a804d4be437a5df3641f854a506642afe3501046 (commit)
via 721876785142fea84f02c7dbe4f325e2a605bd0f (commit)
via 23ed2e110e16f04a34c01ac866b470ec725b7522 (commit)
via eb8d23f47d5fd204b48749ac03faca8244e84264 (commit)
via d81438e143273a538c09cd16e7f92a83beed4027 (commit)
via 6886cf93eca9b05dc2ccfa1d681d86e9d95385b4 (commit)
via e38634ceb8ae5d30d43055711b97395f580f0310 (commit)
from f8098e0eed6594f9d792fc17cd9b940ea586e659 (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 d11e16aec74ad694bd56ce3810954091b0bf1259
Author: Andrew Nugged <nugged at gmail.com>
Date: Wed Jun 17 23:18:01 2020 +0300
Bug 25440: Fixed list of 'show_rule' forming variables in the template
In smart-rules.tt we have `SET show_rule = ...` section which filled
with 'all used in the loop' variables. Because if historical reasons it
seems that there are some missing, few old, and even doubled ones.
This list is fixed now by:
- variable names 'article_requests' and 'renewalsallowed' repeated
so duplicates are removed;
- 'hardduedatebefore' and 'hardduedateexact' not present in the whole
site code anywhere anymore;
IMPORTANT NOTE: these 'hardduedatebefore/hardduedateexact' also
exists as remnants in .po-translation files, a lot.
- 'note', 'hardduedatecompare', 'renewalperiod', 'rentaldiscount'
template variables were missing from this 'show_rule =' checking
code so they are added.
Order of fields updated to match with above "SET field = ..." pack.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Bug 25440: (QA follow-up) Correction for typo
'engthunit -> lengthunit
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cb09303e11b11de2b25852a707211a054fb2b8e1
Author: Andrew Nugged <nugged at gmail.com>
Date: Tue May 19 11:20:41 2020 +0300
Bug 25440: Fix for "uninitialized $maxsuspensiondays" in smart-rules.pl
This warning emitted:
Use of uninitialized value $maxsuspensiondays in string eq
at /admin/smart-rules.pl line 257.
But that not just undef-warning, there is broken logic,
these two lines are mutually contradictory and goes one-by-one:
$maxsuspensiondays = undef if $maxsuspensiondays eq q||;
$maxsuspensiondays = '' if $maxsuspensiondays eq q||;
Fix is simple: to make it '' if it comes undef.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5eebfcf68747b4886b23a9d4c8df37ea7d103edb
Author: Andrew Nugged <nugged at gmail.com>
Date: Tue May 19 11:03:13 2020 +0300
Bug 25440: Fix for "uninitialized value in string eq" in smart-rules.pl
This warning emitted:
Use of uninitialized value in string eq at /admin/smart-rules.pl line 289.
It is solved by one line added to exclude comparison with 'on' string
when variable is 'undef'.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b48162f1be1853a89e0ffc898bc0927edef93f95
Author: Andrew Nugged <nugged at gmail.com>
Date: Sun May 10 18:18:35 2020 +0300
Bug 25440: Fix for "uninitialized value in hash" warning in smart-rules.pl
This warning emitted:
Use of uninitialized value in hash element
at /admin/smart-rules.pl line 569.
that happened because we have NULLs in SQL results for 'categorycode'
and 'itemtype' which later used as 'any' kind of category/item in the
template, so for the template it passed this way:
$rules->{ $r->{categorycode} }->{ $r->{itemtype} }->...
but undef will stringify as "" to become a hash key ("Hashes are
unordered collections of scalar values indexed by their associated
string key" https://perldoc.perl.org/perldata.html),
that's why "undef warning". To prevent warning here is the simple fix:
$rules->{ $r->{categorycode} // '' }->{ $r->{itemtype} // '' }->...
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eb8a0ffcc1bb4d751daa4221bd37faa815904db8
Author: Andrew Nugged <nugged at gmail.com>
Date: Sun May 10 13:28:40 2020 +0300
Bug 25440: Fix for "CGI::param called in list context" in smart-rules.pl
This warning emitted:
CGI::param called in list context from /admin/smart-rules.pl line 262,
this can lead to vulnerabilities. See the warning in "Fetching the value
or values of a single named parameter" at CGI.pm line 412.
Explained here: https://metacpan.org/pod/CGI#Fetching-the-value-or-values-of-a-single-named-parameter
And because all these params are not multi-params, so simple "scalar .."
forcing for CGI->param is the fix. Changes are transparent and same
values should be assigned as before, just no more warnings.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b9ba7151667bc6481bc97335b94e44487c9701bd
Author: Andrew Nugged <nugged at gmail.com>
Date: Sun May 10 13:54:29 2020 +0300
Bug 25440: Extra duplicated call to CGI->param method removed
In code CGI param 'no_auto_renewal_after_hard_limit' assigned to
"$no_auto_renewal_after_hard_limit" var, and then just in the next line
again variable "$no_auto_renewal_after_hard_limit" reassigned with
call to same "$input->param('no_auto_renewal_after_hard_limit')".
Fixed. No logic or results should be changed.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 61aa3f794240443f5c2c99adc016f0d80c7251d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 29 13:42:55 2020 +0200
Bug 21395: Remove 'variable $DEBUG masks earlier declaration in same scope' warning
% prove t/db_dependent/Serials.t
t/db_dependent/Serials.t .. 8/49 "my" variable $DEBUG masks earlier declaration in same scope at /kohadevbox/koha/C4/Barcodes/ValueBuilder.pm line 45.
"my" variable $DEBUG masks earlier declaration in same scope at /kohadevbox/koha/C4/Barcodes/ValueBuilder.pm line 87.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b9e526a12fb338736e149934526e38da782f048f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jun 25 13:48:36 2020 +0100
Bug 21395: (QA follow-up) POD fixes
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e968af43777d47c9134ea1875270af9661ef2f5a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jun 25 11:31:49 2020 +0100
Bug 21395: (QA follow-up) Remove some introduced issues
This patch removes some new error cases introduced during rebase
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1682341b5849c34e59597cda780d4c877d6f3278
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Apr 27 10:31:19 2020 +0200
Bug 21395: Fix QA errors
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b168f4a2e9a03ed56ce857353d4dde940980caba
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Sep 21 18:05:42 2018 +0200
Bug 21395: Make perlcritic happy
This patch adds a .perlcriticrc (copied from qa-test-tools) and fixes
almost all perlcrictic violations according to this .perlcriticrc
The remaining violations are silenced out by appending a '## no critic'
to the offending lines. They can still be seen by using the --force
option of perlcritic
This patch also modify t/00-testcritic.t to check all Perl files using
the new .perlcriticrc.
I'm not sure if this test script is still useful as it is now equivalent
to `perlcritic --quiet .` and it looks like it is much slower
(approximatively 5 times slower on my machine)
Test plan:
1. Run `perlcritic --quiet .` from the root directory. It should output
nothing
2. Run `perlcritic --quiet --force .`. It should output 7 errors (6
StringyEval, 1 BarewordFileHandles)
3. Run `TEST_QA=1 prove t/00-testcritic.t`
4. Read the patch. Check that all changes make sense and do not
introduce undesired behaviour
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9d890c7636ef1d6ec0a1de2161906fd9f4375e97
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 1 11:49:59 2019 +0000
Bug 23410: Add submenus to system preferences sidebar menu
This patch adds a submenu to the sidebar menu in the system preferences
interface. Submenu links let you jump to the sub-sections in each
preference category.
In the search results view, a link is added to allow the user to jump
directly to the section from which those results came. For instance, if
your search returns the "SuspendHoldsOpac" preference, the link will
take you to to the Circulation preferences page and jump the page to the
"Holds policy" section.
This patch also converts the expand/collapse arrows to Font Awesome
icons. The obsolete image files are removed.
If you click a submenu link for a section on the current page which has
been collapsed, the section will expand.
To test, apply the patch and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
- Go to Administration -> System preferences.
- Test the various preference categories and confirm that the submenus
appear correctly and jump you to the right section.
- Test that if you click a section heading to collapse it that
clicking the corresponding submenu link in the sidebar causes it to
expand again.
- Do a search for system preferences and confirm that the sidebar menu
displays correctly.
- Confirm that the "View all..." links take you to the correct page and
section.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: David Nind <david at davidnind.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 1cab6e03b35ef96ebd520e4b3b314381b85c5eda
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Jun 25 15:08:27 2020 +0000
Bug 15400: (follow-up) Remove unnecessary class
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 281c93ed03ceede3914a7bbdd28ef4e8bfc339be
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jun 21 16:41:04 2020 +0000
Bug 15400: Add class on patron brief info to allow hiding date of birth
This just makes a small addition by adding a class to the new
"Born:" entry in the patron brief information area to allow for hiding
it easily with css.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9391d3b263c324f096bbc75a62aa584753351a46
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Apr 21 13:20:57 2020 +0000
Bug 15400: (follow-up) Remove line break
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a2207a080beaa6606e598ae9ee9e1f772e1784ce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 4 14:51:40 2020 +0100
Bug 15400: Clarify usage of patron-age.inc
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dd7490c8080e3b90c28c088568a2c4183e7deed3
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Apr 18 09:27:30 2019 +0000
Bug 15400: (follow-up) Add class to years span
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Michal Denar <black23 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 30e5985aa1babc2f5c9ab2bc7c00e99c12a0d815
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Mar 11 14:25:46 2019 +0000
Bug 15400: (follow-up) Restore 'years' string, remove untranslatable string
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Michal Denar <black23 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 507f48a438ad2e5bb9000027f2a6081e76108adb
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Feb 21 20:44:20 2019 +0000
Bug 15400: (follow-up) Adding age to check out search dropdown
Confirm age shows in the suggestions dropdown when using the checkout
search in header (if user set DOB).
Confirm 'Age unknown' shows if no DOB set.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Michal Denar <black23 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 62a6ed54bbb77f5512293255fe9be7548724c556
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Feb 21 19:45:49 2019 +0000
Bug 15400: (follow-up) Updating text display
Now shows as 'Born: [date of birth] (age)' in circ sidebar menu and
search results
Sponsored-by: Catalyst IT
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Michal Denar <black23 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 2cc3d05d267bae41ba30473f23fe59950da6aeb3
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Nov 2 08:13:35 2018 +0000
Bug 15400: Display date of birth and age more consistantly
Test plan:
0) Apply the patch
1) Go to all of these pages
Patron detail
Other patron pages - look on the left side (circ-menu)
Patron search
Guarantor search ( go to child patron -> edit -> in guarantor
section click "Set to patron"
Search through "Check out" (in the header)
2) Confirm that does show date of birth and date consistantly,
try it on patrons with and without date of birth set to find
possible reggressions
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Michal Denar <black23 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 029f41a667da8f054633432997bc818c1b26a27f
Author: Petro Vashchuk <stalkernoid at gmail.com>
Date: Wed Jun 17 16:44:42 2020 +0300
Bug 25322: fix for not selected "relationship" defaults to father
When a user creates a patron's guarantor on /cgi-bin/koha/members/memberentry.pl but doesn't select the relationship from a dropdown, the relationship defaults to first value, which in default sysprefs is "father". This may or may not be correct as this is not a conscious choice from the user.
The solution is to make the "Relationship" field mandatory when there is no empty entry in the system preferences, always starting with an empty option but not allowing the user to save an empty entry.
And if there is an empty option in sysprefs, it allows to save empty, as well as makes it default choice.
To reproduce with default system preferences:
1) Create a new patron who is assumed to have a guarantor or modify the existing one.
2) Under "Guarantor Information" click on "Search to add" button. After performing the search, select a user to act as guarantor. Don't use the dropdown menu to select a relationship. Save your changes.
3) Observe that relationship is set as "father".
4) Apply the patch.
5) Repeat steps 1 and 2.
6) Observe that it doesn't allow you to save the form until you pick a relationship type.
To reproduce with empty entry added to system preferences:
1) Add an empty entry to borrowerRelationship at /cgi-bin/koha/admin/preferences.pl?tab=patrons in Patron relationships section (example: "|father|mother").
2) Create a new patron who is assumed to have a guarantor or modify the existing one.
3) Under "Guarantor Information" click on "Search to add" button. After performing the search, select a user to act as guarantor. Don't use the dropdown menu to select a relationship. Save your changes.
4) Observe that relationship is set as "father".
5) Apply the patch.
6) Repeat steps 1, 2 and 3.
7) Observe when you save the empty entry it does set the relationship as empty.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3036d46ba4b26df040a25f960c3bc3081734c26
Author: Lucas Gass <lucas at bywatersolutions.com>
Date: Wed May 27 21:35:16 2020 +0000
Bug 22672: Change <i> to <em> and <b> to <strong> in templates, includes, xslt
This patch attempts to replace <i> with <em> AND <b> with <strong> in
order to more accessible to screen readers. This patch makes no attempt
to change Font Awesome icons which typically use <i>. I found templates,
includes and XSLT by using 'git grep ‘<b>’
koha-tmpl/opac-tmpl/bootstrap/en/' and git grep ‘<i>’
koha-tmpl/opac-tmpl/bootstrap/en/
TEST PLAN:
There should be no visible difference on the changed pages. The files
changed are:
koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl
koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
koha-tmpl/opac-tmpl/xslt/OAI.xslt
Read the changes and make sure everything looks correct, try to visit as
many pages as possible and confirm that everything looks as it should.
grep around for cases of <b> or <i> that I could have missed.
Signed-off-by: Timothy Alexis Vass <timothy_alexis.vass at ub.lu.se>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a804d4be437a5df3641f854a506642afe3501046
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jun 25 10:38:16 2020 +0000
Bug 25875: Unit test
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 721876785142fea84f02c7dbe4f325e2a605bd0f
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jun 25 10:38:26 2020 +0000
Bug 25875: Move check for module_bit and code to the JOIN
If we limit the JOIN to rows with the correct subpermission we won't
duplicate the returned patrons
To test:
1 - Give a patron full acquisitions permissions
2 - Also give them several subpermissions on other areas
3 - Go to Acquisitions
4 - Edit a fund
5 - Add a user to the fund
6 - Search for user above
7 - They return multiple times in results
8 - Apply patch
9 - Restart all the things
10 - Repeat search
11 - Patron appears once
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 23ed2e110e16f04a34c01ac866b470ec725b7522
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 22 23:57:29 2020 +0000
Bug 25793: OAI 'Set' and 'Metadata' dropdowns broken by OPAC jQuery upgrade
This patch modifies the OAI XSLT file, correcting the path to jQuery
assets and adds a link to jquery-migrate.
To test, apply the patch and make sure the "OAI-PMH" system preference
is enabled.
1. Go to: <OPACBaseURL>/cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marc21
e.g.
localhost:8080/cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marc21
2. Click on the 'Sets' and 'Metadata' links. The corresponding
panels with set and metatdata information should be shown.
Tested against master, works as described.
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eb8d23f47d5fd204b48749ac03faca8244e84264
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Jun 24 11:34:32 2020 +0100
Bug 25807: Add Template 3.008 to the exclude list
This patch adds version 3.008 of Template to the excludes list in our
cpanfile. It also adds support for displaying this version on the about
page.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d81438e143273a538c09cd16e7f92a83beed4027
Author: Slava Shishkin <slavashishkin at gmail.com>
Date: Wed May 13 20:20:27 2020 +0300
Bug 25491: Fix for "Use of uninitialized value" in InstallAuth.pm
This warning was thrown:
Use of uninitialized value $info{"invalid_username_or_password"}
in numeric eq (==) at /home/vagrant/kohaclone/C4/InstallAuth.pm
line 387.
There is the case when hash key can be undefined in numeric comparison.
Fixed by adding additional precheck for
$info{"invalid_username_or_password"} being Perl's "true".
To test:
1) Go to the first page of the web-installer where it asks to login.
2) Observe the warning in the log file.
3) Apply patch.
4) Repeat step 1.
7) Check that previous warning suppressed.
Mentored-by: Andrew Nugged <nugged at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6886cf93eca9b05dc2ccfa1d681d86e9d95385b4
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Jun 26 10:55:44 2020 +0400
Bug 25858: Use bitwise OR for setting a bit in borrowers.flag
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Thanks-to: Didier Gautheron <didier.gautheron at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e38634ceb8ae5d30d43055711b97395f580f0310
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 24 10:06:57 2020 +0000
Bug 25858: (bug 25858 follow-up) Don't attempt to set flag if already set
Signed-off-by: Didier Gautheron <didier.gautheron at biblibre.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
t/perlcriticrc => .perlcriticrc | 2 +
C4/Accounts.pm | 1 -
C4/Acquisition.pm | 1 -
C4/Auth_with_cas.pm | 18 +-
C4/AuthoritiesMarc.pm | 1 -
C4/Barcodes/ValueBuilder.pm | 141 +++++++-------
C4/Barcodes/annual.pm | 8 +-
C4/Biblio.pm | 1 -
C4/ClassSortRoutine.pm | 4 +-
C4/ClassSplitRoutine/RegEx.pm | 2 +-
C4/Context.pm | 2 -
C4/CourseReserves.pm | 2 +-
C4/Creators.pm | 2 +
C4/Creators/Lib.pm | 2 +-
C4/ImportBatch.pm | 12 +-
C4/InstallAuth.pm | 60 +++---
C4/Items.pm | 1 -
C4/Labels.pm | 2 +
C4/Labels/Label.pm | 5 +-
C4/Languages.pm | 4 +-
C4/Letters.pm | 1 -
C4/Matcher.pm | 2 +-
C4/Members/Messaging.pm | 1 -
C4/Patroncards.pm | 2 +
C4/Patroncards/Patroncard.pm | 8 +-
C4/Record.pm | 8 +-
C4/Ris.pm | 1 -
C4/Search.pm | 5 -
C4/Serials.pm | 21 ++-
C4/Templates.pm | 2 +-
C4/Utils/DataTables/Members.pm | 13 +-
Makefile.PL | 6 +-
about.pl | 3 +-
admin/smart-rules.pl | 28 ++-
circ/ysearch.pl | 1 +
cpanfile | 2 +-
docs/CAS/CASProxy/examples/koha_webservice.pl | 6 +-
docs/CAS/CASProxy/examples/proxy_cas_callback.pl | 6 +-
docs/CAS/CASProxy/examples/proxy_cas_data.pl | 8 +-
fix-perl-path.PL | 4 +-
installer/data/mysql/labels_upgrade.pl | 2 +
installer/data/mysql/patroncards_upgrade.pl | 2 +
installer/data/mysql/update22to30.pl | 16 +-
installer/data/mysql/updatedatabase.pl | 12 +-
installer/externalmodules.pl | 6 +-
installer/install.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/css/preferences.css | 49 ++++-
koha-tmpl/intranet-tmpl/prog/css/right-to-left.css | 12 --
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 10 +
.../en/includes/circ-patron-search-results.inc | 2 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 7 +-
.../intranet-tmpl/prog/en/includes/patron-age.inc | 12 ++
.../intranet-tmpl/prog/en/includes/prefs-menu.inc | 202 +++++++++++++++++++--
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +-
.../prog/en/modules/admin/preferences.tt | 14 +-
.../prog/en/modules/admin/smart-rules.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 34 +++-
.../prog/en/modules/members/moremember.tt | 2 +-
.../en/modules/members/tables/guarantor_search.tt | 2 +-
.../en/modules/members/tables/members_results.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/img/collapse.gif | Bin 57 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/expand.gif | Bin 57 -> 0 bytes
.../intranet-tmpl/prog/js/pages/preferences.js | 15 +-
.../bootstrap/en/includes/holds-table.inc | 12 +-
.../opac-tmpl/bootstrap/en/includes/opac-note.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/clubs/enroll.tt | 2 +-
.../bootstrap/en/modules/opac-auth-MARCdetail.tt | 4 +-
.../en/modules/opac-authoritiessearchresultlist.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 2 +-
.../bootstrap/en/modules/opac-course-details.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../bootstrap/en/modules/opac-downloadshelf.tt | 4 +-
.../bootstrap/en/modules/opac-messaging.tt | 4 +-
.../bootstrap/en/modules/opac-opensearch.tt | 2 +-
.../bootstrap/en/modules/opac-overdrive-search.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +-
.../bootstrap/en/modules/opac-results-grouped.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 8 +-
.../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 4 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 4 +-
koha-tmpl/opac-tmpl/xslt/OAI.xslt | 21 ++-
members/memberentry.pl | 4 +
members/moremember.pl | 1 -
misc/admin/koha-preferences | 1 +
misc/batchRepairMissingBiblionumbers.pl | 1 -
misc/batchdeletebiblios.pl | 2 +-
misc/bin/connexion_import_daemon.pl | 1 +
misc/check_sysprefs.pl | 6 +-
misc/cronjobs/build_browser_and_cloud.pl | 2 +-
misc/cronjobs/gather_print_notices.pl | 3 +-
misc/cronjobs/holds/cancel_expired_holds.pl | 3 +-
misc/cronjobs/longoverdue.pl | 6 +-
misc/cronjobs/rss/rss.pl | 6 +-
.../thirdparty/TalkingTech_itiva_inbound.pl | 1 +
misc/cronjobs/update_totalissues.pl | 2 +-
misc/exportauth.pl | 6 +-
misc/link_bibs_to_authorities.pl | 2 +-
misc/maintenance/cmp_sysprefs.pl | 2 +-
.../fix_accountlines_rmdupfines_bug8253.pl | 1 -
misc/maintenance/touch_all_biblios.pl | 10 +-
misc/maintenance/touch_all_items.pl | 10 +-
.../migration_tools/22_to_30/export_Authorities.pl | 7 +-
.../22_to_30/export_Authorities_xml.pl | 7 +-
.../22_to_30/move_marc_to_biblioitems.pl | 8 +-
misc/migration_tools/buildCOUNTRY.pl | 2 +-
misc/migration_tools/buildEDITORS.pl | 1 -
misc/migration_tools/buildLANG.pl | 2 +-
misc/migration_tools/bulkmarcimport.pl | 7 +-
misc/migration_tools/remove_unused_authorities.pl | 1 -
misc/perlmodule_rm.pl | 2 +-
misc/translator/LangInstaller.pm | 2 +-
misc/translator/TmplTokenizer.pm | 58 +++---
misc/translator/VerboseWarnings.pm | 24 +--
misc/translator/po2json | 14 +-
misc/translator/tmpl_process3.pl | 81 ++++-----
misc/translator/xgettext.pl | 30 +--
opac/opac-MARCdetail.pl | 1 -
opac/opac-alert-subscribe.pl | 1 -
opac/opac-authorities-home.pl | 1 -
opac/opac-authoritiesdetail.pl | 1 -
opac/opac-basket.pl | 1 -
opac/opac-search.pl | 5 -
opac/opac-serial-issues.pl | 2 -
opac/opac-showreviews.pl | 1 -
patroncards/create-pdf.pl | 10 +-
patroncards/image-manage.pl | 2 +-
patroncards/print.pl | 12 +-
plugins/plugins-upload.pl | 2 +-
reports/acquisitions_stats.pl | 1 -
reports/bor_issues_top.pl | 26 ++-
reports/borrowers_out.pl | 7 +-
reports/catalogue_out.pl | 2 -
reports/catalogue_stats.pl | 5 -
reports/issues_avg_stats.pl | 5 -
reports/issues_stats.pl | 5 +-
reports/reserves_stats.pl | 8 +-
rewrite-config.PL | 33 ++--
svc/holds | 1 -
t/00-testcritic.t | 32 +---
t/Languages.t | 2 +-
t/Prices.t | 4 +-
t/SuggestionEngine.t | 2 +-
t/db_dependent/Accounts.t | 1 -
t/db_dependent/Acquisition/OrderFromSubscription.t | 3 +-
t/db_dependent/Acquisition/OrderUsers.t | 1 -
t/db_dependent/Barcodes.t | 4 +-
t/db_dependent/Context.t | 2 -
t/db_dependent/Hold.t | 2 +-
t/db_dependent/LDAP/test_ldap_add.pl | 2 +-
t/db_dependent/Record/Record.t | 32 ++--
t/db_dependent/Search.t | 6 +
t/db_dependent/Serials.t | 1 -
t/db_dependent/Serials_2.t | 1 -
t/db_dependent/Utils/Datatables_Members.t | 35 +++-
t/db_dependent/XISBN.t | 1 -
t/db_dependent/cronjobs/advance_notices_digest.t | 6 +-
t/db_dependent/www/auth_values_input_www.t | 1 -
t/dummy.t | 1 +
tags/review.pl | 6 +-
tools/batchMod.pl | 5 +-
tools/export.pl | 2 -
tools/import_borrowers.pl | 3 -
tools/letter.pl | 2 +-
tools/modborrowers.pl | 3 +-
tools/overduerules.pl | 2 -
tools/picture-upload.pl | 14 +-
tools/upload-cover-image.pl | 6 +-
xt/author/show-template-structure.pl | 6 +-
xt/author/translatable-templates.t | 2 +-
xt/find-license-problems.t | 5 +-
xt/fix-old-fsf-address | 8 +-
xt/single_quotes.t | 2 +-
177 files changed, 889 insertions(+), 673 deletions(-)
rename t/perlcriticrc => .perlcriticrc (89%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/collapse.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/expand.gif
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list