[koha-commits] main Koha release repository branch master updated. v17.11.00-1378-g150a589
Git repo owner
gitmaster at git.koha-community.org
Thu May 3 18:50:07 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 150a589e088906e2eed255fe05aa292dfdde5fdc (commit)
via 8c4928048e9013956413378ad33873d75d7d3e96 (commit)
via ba0abdf9292c26cfddb040bb3e491d03bf7e013f (commit)
via 67ec2ead88c7d58f7977a206ad75f00eddef8095 (commit)
via 0f9ec1287539e61f4dd089131cf69cb90fb3f8e2 (commit)
via 6d59eee2bae08799358a8ea4dc17d4dd861784c4 (commit)
via b7787d1022b5f5c344e7d841a48ea1a2cc8dceed (commit)
via ddd40048ce482d90eba45031b892e516af6de8cd (commit)
via 4c3a257448a238ec070ef209be70f76182cc91c4 (commit)
via 60e5a8a2aba887371966c593ffab44c6a4ac5d94 (commit)
via 90fd45d0f279c58083e14f7953ea762726b8386f (commit)
via 4c9b26e437f70f9ad422586cc3a40812aa660aff (commit)
via fc595ecc175c84727ed33157b5572dcb7196e163 (commit)
via fde5422d80f2f85c3080aa1b2eb9792059d9bf55 (commit)
via d15af45055fd9c1c8df575f49a382ba7e4b48d0d (commit)
via ae29e71c2a928b47a78b12e72d149849d8d8f331 (commit)
via 2d285342347248749bb26e0be635e062bff265dc (commit)
via e5220bc6a130e7fe8a31739b98993b203cfee2b6 (commit)
via b6c739ae9c7ff7a50398d6d4e22f7afa69a3cc47 (commit)
via 4f8add96131837dc797cb0222c67060732e4ffa8 (commit)
via d6f3e1fbe6d2efa593b3a7ca06b6d8664d61f650 (commit)
via 64be74b3380441b645ec808e0c30455e76b326e1 (commit)
via 0a50dc1ad59b52ae47b5749b984763e8e85d0cb7 (commit)
via ebc32f2aae4081c4f0e3e10e5353d65faff77c7a (commit)
from de9cfe0c946e394ebbe765f8b07bacf23d3d9c66 (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 150a589e088906e2eed255fe05aa292dfdde5fdc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 3 13:39:53 2018 -0300
Bug 11317: DBRev 17.12.00.041
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8c4928048e9013956413378ad33873d75d7d3e96
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Apr 28 02:30:55 2018 +0200
Bug 11317: (QA follow-up) Change tool name to be more general
I think this tool could be used in multiple ways, for all kinds
of files that you want to protect by login in Koha. So a more
general name might work better.
This is a suggestion, not mandatory.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ba0abdf9292c26cfddb040bb3e491d03bf7e013f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Apr 28 00:29:06 2018 +0200
Bug 11317: (QA follow-up) Fix merge error and punctuation
2 tiny fixes:
- Remove space before : as this is not correct in English
- Remove an errorenous commented line that probably snuck back
in from a merge
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 67ec2ead88c7d58f7977a206ad75f00eddef8095
Author: Roch D'Amour <roch.damour at inlibro.com>
Date: Mon Apr 23 09:20:35 2018 -0400
Bug 11317: (follow-up) Add two-level entry to koha-conf and remove unwanted characters
- Removed merge marker
- Changed include path in favor of using the Asset tt plugin (bug 20538)
- Changed access_dir to a two-level entry for clarity
Test plans stay the same, just make sure that the two-level configuration entry
work properly and everything pass QA.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.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 0f9ec1287539e61f4dd089131cf69cb90fb3f8e2
Author: Roch D'Amour <roch.damour at inlibro.com>
Date: Tue Apr 17 14:24:07 2018 -0400
Bug 11317: Add a way to access files from the intranet
This squash contains all of these commits:
- Adds a page to access log files on the server from the intranet
- Update ID to allow for permalinking
- Rename config to "'accessdir' and fix qa
- Allows for multiple directories to be accessible
- Update the link under reports
- (Follow-up) Fixing merge error and cosmetic changes
- (Follow-up) Fix tab chars and move javascript to the footer
- (QA Follow-up) Fix datatable
- Make filename unicode-proof, renamed accessdir to access_dir and fix update
Test plans:
- Apply patch, update database
- Add to koha-conf:
<access_dir>/tmp/koha-public/one</access_dir>
<access_dir>/tmp/koha-public/two</access_dir>
<access_dir>/tmp/koha-public</access_dir>
- Create these directories ( mkdir /tmp/koha-public , etc...)
- Create these files:
echo "hello world!" > /tmp/koha-public/❤
echo "test" > /tmp/koha-public/one/samename.txt
echo "this is not the same" > /tmp/koha-public/two/samename.txt
- Login as Superadmin, go to tools > reports files
- Click on ❤, make sure it's downloadable and readable
- Click on both samename.txt, look inside and make sure the file is different
- Login as NON-superadmin. Go under tools, see no Report/Log under the third column
- Go to add tools/access_file permission to user
- See new entry under tools third column.
- validate link is ok.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.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 6d59eee2bae08799358a8ea4dc17d4dd861784c4
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Mar 28 22:40:09 2018 +0000
Bug 20103: Readonly::XS is completely bogus post perl 5.8
A ha! Lie about who we are, and the module will return a version.
./koha_perl_deps.pl -a
-- before patch Readonly::XS is 0
-- after patch it has a version number.
run koha qa test tools
Signed-off-by: Victor Grousset <victor.grousset at biblibre.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 b7787d1022b5f5c344e7d841a48ea1a2cc8dceed
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Mar 19 09:33:50 2018 +0000
Bug 20444: Remove sub GetAttributes
0) Apply this patch
1) git grep GetAttributes should return no occurencies
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
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 ddd40048ce482d90eba45031b892e516af6de8cd
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Mar 19 09:33:07 2018 +0000
Bug 20444: Update test
0) Apply this patch
1) prove t/db_dependent/Members/Attributes.t
should return green
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
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 4c3a257448a238ec070ef209be70f76182cc91c4
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Mar 19 09:27:07 2018 +0000
Bug 20444: Use Koha::Patron::Attribute::Types object for getting patron attributes in letter.pl
Test plan:
0) Apply the patch
1) Do not have any patron attribute types defined
2) Go to Tools -> Notices and slips
3) Edit any slip/letter which uses table borrower
4) Confirm the editing works, and the slip/letter itself works
5) Add some patron attributes types and define them a value for any
patron
6) Go to Tools -> Notices and slips and edit any slip/letter which uses
table borrower
7) Confirm, the attributes are listed in available fields
8) Confirm the slip/letter is working when you add a attribute to it
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
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 60e5a8a2aba887371966c593ffab44c6a4ac5d94
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Dec 5 10:43:05 2017 +0000
Bug 19752: offline_circ/service.pl - Return HTTP status 401 when authentication failed and add option nocookie
Test plan:
- Apply this patch,
- log in to Koha,
- go to cgi-bin/koha/offline_circ/service.pl with no valid user
and password as parameters and nocookie set to 1. i.e:
cgi-bin/koha/offline_circ/service.pl?userid=alex&password=wrongpass&nocookie=1,
- auth should fail
- check that the response code is 401
Signed-off-by: Maksim Sen <maksim.sen at inlibro.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 90fd45d0f279c58083e14f7953ea762726b8386f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Apr 22 18:37:11 2018 +0000
Bug 19972: (QA follow-up) Fix id name
Renames #type-filter to #itemtype-filter
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4c9b26e437f70f9ad422586cc3a40812aa660aff
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Tue Jan 16 10:06:20 2018 +0100
Bug 19972: Make holds to pull list honors item-level_itypes syspref
And reflect that in the UI strings + variable names
Test plan:
1. Set syspref "item-level_itypes" to "specific item"
2. Create a hold on a record with one item
3. Change the document type of the item
4. Check that the item edition page and the record page show 2 different
types.
5. Go to /cgi-bin/koha/circ/pendingreserves.pl
6. Check that the displayed type is the item one
7. Set syspref "item-level_itypes" to "biblio record"
8. Go to /cgi-bin/koha/circ/pendingreserves.pl
9. See that the displayed type is the item one. When the sysopref says
"record"
This is the bug.
10. Apply this patch
11. Go to /cgi-bin/koha/circ/pendingreserves.pl
12. See that the displayed type now follows the syspref
13. Set syspref "item-level_itypes" to "specific item"
14. Go to /cgi-bin/koha/circ/pendingreserves.pl
15. See that the displayed type still follows the syspref
Signed-off-by: Lucie Gay <lucie.gay at ens-paris-saclay.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 fc595ecc175c84727ed33157b5572dcb7196e163
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Apr 26 16:57:47 2018 +0000
Bug 20666: Correct permissions on opac-routing-lists.pl
You will need to have the 'Your routing lists' appear
in the opac-user page in order to trigger the error.
Make sure plack is off, and you will an error 500 page.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fde5422d80f2f85c3080aa1b2eb9792059d9bf55
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Apr 26 16:22:16 2018 +0000
Bug 20666: Correct executable permissions
TEST PLAN
---------
On a kohadevbox:
1) sudo koha-plack --enable kohadev
2) restart_all
3) Enter fines for a patron in the staff client
4) Go to the 'Fines' tab (left pane)
5) Go to the 'Account' tab (below the row of buttons)
6) Click 'Details'
-- no issues
7) sudo koha-plack --disable kohadev
8) restart_all
9) refresh page
-- Error 500
10) apply patch
11) restart_all
12) refresh page
-- no issues
13) sudo koha-plack --enable kohadev
14) restart_all
15) refresh page
-- no issues
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d15af45055fd9c1c8df575f49a382ba7e4b48d0d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 24 15:21:36 2018 -0300
Bug 20637: Fix filters content on the holds to pull screen
libraries and locations are separated by <br> whereas itypes are using
\n
This patch standardized the separator to generate correctly the filters
pulldown
Test plan:
- Place a hold on a biblio record which has several items
- Define different locations and itypes for these items
- Display the holds on the "Holds to pull" screen and make sure the
filters are working correctly (focus on the dropdown list)
Signed-off-by: Victor Grousset <victor.grousset at biblibre.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 ae29e71c2a928b47a78b12e72d149849d8d8f331
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 25 12:38:25 2018 +0000
Bug 20329: Text input fields are wider than the fieldset class they are inside of
This alternate patch defines a width of 100% for text inputs and selects
inside sidebar fieldsets. The scope of this style is limited to the
sidebar by unsetting the width for fieldsets within "#yui-main," the
main body of the page.
This patch also removes inline styles from two templates which are now
unnecessary.
To test, apply the patch and clear your cache if necessary.
View various pages which have a sidebar search form: acqui/invoices.pl,
members/members-home.pl, circ/overdue.pl, acqui/parcel.pl. Confirm that
form fields in the sidebar look correct.
Confirm that other forms styled with the "brief" class aren't
unintentionally affected by this patch. For example:
circ/request-article.pl, members/member-password.pl,
reports/reports-home.pl, reserve/request.pl
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 2d285342347248749bb26e0be635e062bff265dc
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Sun Mar 4 05:31:15 2018 +0000
Bug 20329: Shorten the width of text input fields
This makes the text input fields fit tidily within the border of the
fieldset class elements they are within.
Test plan:
1. Go to the acqui/invoices.pl, members/members-home.pl,
circ/overdue.pl, acqui/parcel.pl and notice that the text input fields
on the fieldset element on the left hand side of the screen for
filtering search results are too wide and go over the border of the
fieldset element
2. Apply patch
3. Refresh the aforementioned pages and notice the text inputs have a
shortened width and now fit within the fielset class element
Sponsored-By: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.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 e5220bc6a130e7fe8a31739b98993b203cfee2b6
Author: Magnus Enger <magnus at libriotech.no>
Date: Mon Apr 9 12:39:23 2018 +0200
Bug 20546: Display shelving location on checkin
Currently, the sehlving location is not being displayed in the table
of checked in items on <intranet>/cgi-bin/koha/circ/returns.pl
To test:
- Make sure you have a couple of books with a value for shelving location (952$c)
- Check the books out
- Check the books in
- Verify nothing is displayed in the "Shelving location" column
- Apply this patch
- Check the books out and in again
- Verify the shelving location is now being displayed
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b6c739ae9c7ff7a50398d6d4e22f7afa69a3cc47
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Apr 26 13:48:58 2018 +0200
Bug 20304: (QA follow-up) Remove unwanted 'my'
'my' creates a new '$value' variable, and prevented the '$value' in
outer scope to be modified
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4f8add96131837dc797cb0222c67060732e4ffa8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 27 13:36:21 2018 -0300
Bug 20304: Remove warnings from cataloguing scripts
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d6f3e1fbe6d2efa593b3a7ca06b6d8664d61f650
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Mar 23 15:03:52 2018 -0300
Bug 18342: Mark Cache::Memcached as mandatory
Signed-off-by: Kyle M Hall <kyle 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 64be74b3380441b645ec808e0c30455e76b326e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 27 16:19:07 2017 -0300
Bug 18342: Enable memcached by default for new installs
Note that there is no way to create an install without memcached.
As it is now considered as stable, there is no point to not use it.
Test plan:
Create a new Koha install and make sure memcached is enabled by default
Signed-off-by: Kyle M Hall <kyle 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 0a50dc1ad59b52ae47b5749b984763e8e85d0cb7
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Thu Apr 26 13:08:25 2018 +0000
Bug 20665: Reset MySQL connection time zone in the OAI-PMH Provider
TEST PLAN
---------
apply unit test patch
prove t/db_dependent/OAI/Server.t
-- should fail
apply this patch
prove t/db_dependent/OAI/Server.t
-- should pass
run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ebc32f2aae4081c4f0e3e10e5353d65faff77c7a
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Thu Apr 26 13:05:51 2018 +0000
Bug 20665: Units tests for testing MySQL connection time zone
TEST PLAN
---------
apply this test patch
prove t/db_dependent/OAI/Server.t
-- should fail
apply the other patch
prove t/db_dependent/OAI/Server.t
-- should pass
run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 2 +-
C4/Installer/PerlModules.pm | 1 +
C4/Members/Attributes.pm | 18 ---
Koha.pm | 2 +-
Koha/OAI/Server/Repository.pm | 13 +++
Makefile.PL | 2 +-
cataloguing/additem.pl | 37 +++---
circ/pendingreserves.pl | 9 +-
circ/returns.pl | 2 +-
debian/docs/koha-create.xml | 15 ---
debian/scripts/koha-create | 27 +----
debian/templates/koha-conf-site.xml.in | 10 +-
debian/templates/koha-sites.conf | 4 +-
etc/koha-conf.xml | 8 ++
installer/data/mysql/updatedatabase.pl | 11 ++
installer/data/mysql/userpermissions.sql | 1 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 11 +-
.../intranet-tmpl/prog/en/includes/permissions.inc | 1 +
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 3 +
.../prog/en/modules/acqui/basketgroup.tt | 4 +-
.../prog/en/modules/admin/aqbudgets.tt | 2 +-
.../prog/en/modules/circ/pendingreserves.tt | 18 +--
.../prog/en/modules/reports/reports-home.tt | 36 +++---
.../prog/en/modules/tools/access_files.tt | 72 ++++++++++++
.../prog/en/modules/tools/tools-home.tt | 6 +
offline_circ/service.pl | 14 ++-
rewrite-config.PL | 2 +-
t/db_dependent/Members/Attributes.t | 14 +--
t/db_dependent/OAI/Server.t | 24 +++-
tools/access_files.pl | 122 ++++++++++++++++++++
tools/letter.pl | 17 +--
31 files changed, 367 insertions(+), 141 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
mode change 100644 => 100755 members/accountline-details.pl
mode change 100644 => 100755 opac/opac-routing-lists.pl
create mode 100755 tools/access_files.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list