[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.12-52-g098360c
Git repo owner
gitmaster at git.koha-community.org
Wed May 24 05:19:36 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 16.05.x has been updated
via 098360ceae6e59c96912aa981ce3bd5619085acc (commit)
via aebc8a165ef870733ea752863acf48953e1bdd2c (commit)
via a470b372778d05685b87c7850947aedf107d0a86 (commit)
via 2197f64e113b3c9c81b9075b86700346061584ac (commit)
via f7f06ed850bd74bfb628a01748ff573d6b102827 (commit)
via e9a1fa07b5209bb5a53b653d870c7463adc1f699 (commit)
via f7773cafb962e086109094f3108ccfb98b60490f (commit)
via 9e1ecb4c9260d2b2d1256df9fd21fd27706791b3 (commit)
via 0bbc3bd5bc471883e6b5bd2bfbe8555ce62f40a1 (commit)
via 3a1e961f2442f5d494a7b7fd1019cd2abb1ba1e7 (commit)
via 99fa92a6fd3699500f74f78614ac4fde3c564de1 (commit)
via 7cce8ae875a4b82771a0c84841728f9da6e20af5 (commit)
via 4185854e9f760d2a03a62236d04beb8621273e7a (commit)
via 80f0b3bcab28f792fbd08a7b5638a6a271f777ab (commit)
via bf4dc36b14a10946a62d7337ab49d7bf76916a46 (commit)
via c1227d9d786a648cb190a83cb0ff85f067f808b6 (commit)
via 9b37ca8cadfcc2b5ed838a87711a3b7f58abeac8 (commit)
via 31131816ffc440d58bcb2cc035b9593040d815bb (commit)
via 2a724e511da845b8adc3a141be0723178a9f06d6 (commit)
via c49d0e2109853e3fbcc51df663a94e08a980685d (commit)
via c90692657738f283697f2476cd12910111aa61bc (commit)
via ae561349fb8856ade637e627c19ad22f0e5dc779 (commit)
via 020429d407039c401e18230d62f41b533ab913fe (commit)
via 2203f7d39e4504cfefa2ecb6c160c8f5f0054e7b (commit)
via f178fd076b90c53f7b45c8f1abbb9df6de5e1122 (commit)
via dcdf1dcdac149e66d691a60c9b63164a76b2dc56 (commit)
via 9d6549d3b61d72d8fb95925837b3a498992c991e (commit)
via d756d212444092b5f06b47da22fb0eb9329baf8f (commit)
via 1e1cf2702f2d13cec1d21f7fe5df706d3e988aac (commit)
via 63866d4b315d74593983a3da32a5c8d5f0c80b85 (commit)
via 5d384b9d8cc432e7d3c36735e2765c1ed2e64543 (commit)
via bdc4f1757f691d5997d7d9ec44d61de4686609b8 (commit)
via 6cc7197e2e64a23082cbc1e4458c6442051aa97a (commit)
via e5603d06918ea7eae0d87ebc8da731b228812fd7 (commit)
via bf9cb4bdbce67b5b25ea16924474c773315c5d53 (commit)
via f8a20081322f821bc2843db306d84c93b3d4fcb3 (commit)
via 945838da9ebf66ee8aab07093421fe26174e483e (commit)
via dac29f8c12963278a96a2ebaf5ab28597bc61a78 (commit)
via 8e872edef33570afa7f075b909e5a96b0d3a5a06 (commit)
via 71f86e4c640ce208e619b03ab572d7ae89e79075 (commit)
via cdc4bc73bfae1d4ee05ca64be8ce31dbcd2f962b (commit)
via 56b2d75e385ab502588a38e4a8e79907a2d52818 (commit)
via 895767c146e463d231f4cc95a8e45149b5a51359 (commit)
via b6c22f0bc812b88a3bdba1ea8f751859bc0ed521 (commit)
via 919476c7b6d54dd20154f372665a6e8d738f6c16 (commit)
via e456d74c595913d237a170de9201c83e1b043dd1 (commit)
via 7e2e86182f43d656f456370a6d16ba528485e7ca (commit)
via 46c5483c946bbb426801749908287dd2bf893f87 (commit)
via 41d9456743ed009f7e50992b4b770fc865af39de (commit)
via ff14020a2b442efba07daaa0df6ac4e5bf223901 (commit)
via bffa27725a848211b1e1dae4142c7bf5fa524117 (commit)
via 9f01cbfe652ee22f3a97dfc3e94f493c6b78e7ab (commit)
from 16f7a12a9091b0fe339a230bf98b976867f673bc (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 098360ceae6e59c96912aa981ce3bd5619085acc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 12 11:51:22 2016 +0200
Bug 16749: Update debian docs for koha-translate
This patch adds the -d option to the documentation (with thanks to
Magnus Enger).
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit aebc8a165ef870733ea752863acf48953e1bdd2c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 16 10:38:54 2016 +0200
Bug 16749: Adjustments for koha-translate
[AMENDED February 10, 2017]
[1] Added reading /etc/default/koha-common as in the other debian scripts.
We need it for KOHA_HOME.
[2] Add a -d|--dev parameter for dev installs.
[3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME).
They are read from default file or set by adjust_paths_dev_install.
[4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL.
[5] Remove references to obsolete themes ccsr and prog.
Test plan:
[1] Regular package install:
Copy koha-translate to /usr/sbin.
Run koha-translate -l to show installed languages.
Run koha-translate -l -a to show available languages.
Add a language: koha-translate -i nl-NL.
Check template folders in regular location (/usr/share/koha/...)
Remove a language: koha-translate -r nl-NL. Check again.
[2] Dev install or kohadevbox:
Copy koha-translate to /usr/sbin.
If needed, add the <dev_install> line to koha-conf.xml.
Run koha-translate -l -d yourinstance to show installed languages.
(Note: You only see the languages installed in this instance.)
Add a language: koha-translate -i nl-NL -d yourinstance.
Check template folders in the clone.
Remove a language: koha-translate -r nl-NL -d yourinstance.
Note: Make sure you have sufficient file permissions for the kohaclone
files and koha-conf.xml. On kohadevbox you might need to run sudo
koha-translate within the the vagrant user context.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested on Jessie (Debian VM and Kohadevbox)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a470b372778d05685b87c7850947aedf107d0a86
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 10 10:33:57 2017 +0100
Bug 16749: Adjustments for koha-plack
[1] Use run_safe_xmlstarlet for plack workers and requests
[2] Simplify adjust_paths. The lazy export statement is actually enough to
replace adjust_paths by one direct call to adjust_paths_dev_install.
Test plan:
[1] Copy koha-functions.sh and koha-plack:
cp [YOUR_PATH]/debian/scripts/koha-functions.sh /usr/share/koha/bin/
cp [YOUR_PATH]/debian/scripts/koha-plack /usr/sbin/
where YOUR_PATH might well be /home/vagrant/kohaclone.
[2] Make sure that you have dev_install in koha-conf.
Stop and start koha-plack. Verify with ps aux|grep plack.
[3] Rename dev_install to nodev_install (in start and end tag).
Now stop/start koha-plack. Verify with ps aux|grep plack.
[4] Change plack_requests to 51 in your koha-conf.
Restart Plack and check that you see 51 in ps aux|grep plack.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested on Jessie (Debian VM and Kohadevbox)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2197f64e113b3c9c81b9075b86700346061584ac
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 12 12:22:05 2016 +0200
Bug 16733: [Follow-up] Add $home to api path too
In the meantime api was enabled in plack.psgi and needs a little tweak
too for a dev install.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Conflicts:
debian/templates/plack.psgi
commit f7f06ed850bd74bfb628a01748ff573d6b102827
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 15 14:08:28 2016 +0200
Bug 16733: Adjust other debian scripts using PERL5LIB
This patch makes the following changes:
koha-foreach, koha-upgrade-schema (shell scripts):
[1] Read default file
[2] Include helper functions
[3] Add call to adjust_paths_dev_install
[4] Replace hardcoded path by $PERL5LIB
koha-shell (perl script):
[1] Remove hardcoded lib path
[2] Add a sub that reads PERL5LIB from default or koha-conf, just as the
shell scripts do.
koha-plack (shell script), plack.psgi:
[1] Add call to adjust_paths_dev_install
[2] Remove hardcoded lib path
[3] Add installer path to PERL5LIB, remove it from plack.pgsi
koha-sitemap (shell script):
[1] Add call to adjust_paths_dev_install
[2] Remove hardcoded lib path
[3] Add installer path to PERL5LIB
[4] Adjust path for call to sitemap cron job
koha-start-sip (shell script):
[1] Read default file
[2] Include helper functions
[3] Add call to adjust_paths_dev_install
[4] Adjust path to C4/SIP
koha-stop-sip (shell script):
[1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon)
[2] Same for paths in daemon client options
NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out
intentionally.
Test plan:
[1] Regular install:
Run koha-foreach echo Hi
Run koha-upgrade-schema yourinstance
Run koha-shell yourinstance
If you have plack, run koha-plack --start|--stop yourinstance
Run koha-sitemap --generate yourinstance
Run koha-start-sip yourinstance
Run koha-stop-sip yourinstance
[2] Dev install [yourinstance] with <dev_install> in koha-conf.xml:
Run koha-upgrade-schema yourinstance
Run koha-shell yourinstance
If you have plack: koha-plack --start|--stop yourinstance
Run koha-sitemap --generate yourinstance
Run koha-start-sip yourinstance
Run koha-stop-sip yourinstance
[3] Git grep on koha/lib
You should no longer see occurrences in debian/scripts except:
koha-translate: see report 16749
koha-upgrade-to-3.4: left out intentionally
[4] Git grep on koha/bin
You should only see hits for lines with koha-functions in the
debian scripts except:
koha-upgrade-to-3.4: left out intentionally
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Most scripts tested on Wheezy (although it would not matter much).
Plack script tested on Jessie.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e9a1fa07b5209bb5a53b653d870c7463adc1f699
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 15 13:57:12 2016 +0200
Bug 16733: Adjust koha-rebuild-zebra
[1] Add a call to the new adjust_paths_dev_install
[2] Differentiate location of rebuild_zebra.pl
[3] Replace a hardcoded path by $PERL5LIB
Test plan:
Adjust a biblio record in package or dev install.
Run koha-rebuild-zebra -b -z for same instance.
Verify that the change has been indexed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f7773cafb962e086109094f3108ccfb98b60490f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 15 13:43:41 2016 +0200
Bug 16733: Adjust koha-indexer
[1] Add a call to the new adjust_paths_dev_install
[2] Differentiate location of rebuild_zebra.pl
NOTE: The scripts assume koha-functions.sh to be in /usr/share/koha/bin.
Finding a better location for this shell library may be hard.
Test plan:
Run koha-indexer for a regular package install or a dev install.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9e1ecb4c9260d2b2d1256df9fd21fd27706791b3
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Sat Nov 12 08:50:04 2016 +0100
Bug 17618: perl-modules Debian package name change
Newer versios of perl-modules have a version number in the package name.
This patch makes Koha aware of perl-modules-5.22 and perl-modules-5.24
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0c5905843dfc55e422c667f9d0aa6f243f56f1a8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0bbc3bd5bc471883e6b5bd2bfbe8555ce62f40a1
Author: Mason James <mtj at kohaaloha.com>
Date: Wed May 24 12:02:23 2017 +1200
Bug 17936 [Generated CSS] Search bar not aligned on right in small screen sizes
commit 3a1e961f2442f5d494a7b7fd1019cd2abb1ba1e7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Apr 29 17:45:48 2017 +0000
Bug 17936 - Search bar not aligned on right in small screen sizes
This patch tweaks the OPAC's CSS so that the main search form's fields
have consistent width at small screen sizes.
To test, apply the patch and process the LESS files. View the OPAC main
page at a very narrow browser width and confirm that the text field
width matches that of the dropdown and button.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 99fa92a6fd3699500f74f78614ac4fde3c564de1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jan 17 16:49:40 2017 +0100
Bug 17925: Disable debugging in reports/bor_issues_top.pl
Remove setting $debug to 1. This prevents creation of file
tmp/bor_issues_top.debug.log.
Enable warnings pragma.
Resolve a uninitialized warning on $sep like:
Use of uninitialized value $CGI::Compile::ROOT::usr_share_koha_masterclone_reports_bor_issues_top_2epl::sep in string eq at /usr/share/koha/masterclone/reports/bor_issues_top.pl line 66.
Test plan:
Restart Plack (as you always do when testing).
Remove file /tmp/bor_issues_top.debug.log.
Open Reports/Patrons with the most checkouts.
Check if the file in /tmp has not been created again.
Check the log for warnings after you restarted Plack.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e739fecbc83ff0ee32f155ae7e74c4780a5201c2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7cce8ae875a4b82771a0c84841728f9da6e20af5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Apr 27 15:39:35 2017 -0400
Bug 18504 - Amount owed on fines tab should be formatted as price if <10 or credit
To test:
1 - Give a patron a fine of 1
2 - View opac fines tab, it shows as '1'
3 - Give patron a credit of '1'
4 - View opac fines tab, it shows as '1'
5 - Apply patch
6 - Both now show as '1.00'
Signed-off-by: Lisa Gugliotti <lisa at hchlibrary.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6da7ed1d8c17960e1e90b8f197fe948d4ed25bad)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4185854e9f760d2a03a62236d04beb8621273e7a
Author: Mason James <mtj at kohaaloha.com>
Date: Wed May 24 11:54:36 2017 +1200
Bug 16515 [Generated CSS] Did you mean? links don't wrap on smaller screens
$ lessc -x bootstrap/less/opac.less > bootstrap/css/opac.css
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 80f0b3bcab28f792fbd08a7b5638a6a271f777ab
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Apr 29 18:45:30 2017 +0000
Bug 16515 - Did you mean? links don't wrap on smaller screens
This patch tweaks some CSS in the OPAC to give the "Did you mean" block
better layout on smaller screens.
To test, apply the patch and process LESS files. Enable "Did you mean"
plugins for the OPAC in Administration.
Perform a search in the OPAC and confirm that the "Did you mean" block
looks correct. Resize your browser to various widths and confirm that
the block handles all sizes well.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit bf4dc36b14a10946a62d7337ab49d7bf76916a46
Author: pongtawat <pongtawat at punsarn.asia>
Date: Tue Apr 4 23:06:45 2017 +0700
Bug 18383 - Correct items.onloan schema comment
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended to include items and deleteditems.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 69a24812eda9c10841d8f20ce4c689305703b6f0)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c1227d9d786a648cb190a83cb0ff85f067f808b6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 6 10:12:20 2016 +0100
Bug 17257: Fix add/edit patrons under MySQL 5.7
If no guarantor is defined the patron won't be added/modified and an
error will be raised:
DBD::mysql::st execute failed: Incorrect integer value: '' for column
'guarantorid'
Test plan:
Using MySQL 5.7 (and/or sql_mode=STRICT_TRANS_TABLES)
Create a patron without guarantor
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Tested with MariaDB 10.0.30 (sql_mode='STRICT_TRANS_TABLES')
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 720071004516ec4e119dc5ec7f9538b56313b186)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9b37ca8cadfcc2b5ed838a87711a3b7f58abeac8
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Tue Apr 18 12:24:26 2017 +0000
Bug 18444: Add TalkingTechItivaPhoneNotification to sysprefs.sql
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: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3e1f21ae0ddcef1c351639e228410f8523f5efe4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 31131816ffc440d58bcb2cc035b9593040d815bb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 11 12:37:24 2017 -0300
Bug 18370: Use splice instead of splice
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ec822b855244cacf36757e9028779ad9d270c370)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2a724e511da845b8adc3a141be0723178a9f06d6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 3 11:50:07 2017 -0300
Bug 18370: Columns visibility on patron search - Hide the correct column
When a column is hidden by default on the patron search result table,
if the logged in user does not have the "tools > manage_patron_lists"
permission, the wrong column will be hidden.
Test plan:
Edit the column visibility detail for "Patrons > id=memberresultst"
Set "Fines" hidden by default
Search for patrons
=> Without this patch, if the logged in user does not have the
manage_patron_lists permission, the wrong column will be
hidden/displayed.
Signed-off-by: Séverine Queune <severine.queune at bulac.fr>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0a2b14dd16292572e5163e5dfa491432be1660d2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c49d0e2109853e3fbcc51df663a94e08a980685d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 27 17:18:22 2017 -0300
Bug 18340: Fix progress bar length
The progress bar (for background jobs) should be fully filled when 100%
is hit, right? :)
It has been introduced quite long time ago when the size of the progress
bar has been changed from 150 to 200px, and the code has been
refactored.
Test plan:
Launch a big modification/deletion of records/items in a batch.
You should see the progress bar progressing to 100 and reach 100!
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e424bd0d84d4aa30ceae5e6cea0ee453413f0ef9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c90692657738f283697f2476cd12910111aa61bc
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed May 3 16:43:22 2017 -0400
Bug 18535 - Clicking 'edit printer profile' in label creator causes software error
1) Go to Tools > Label creator
2) If you don't have a printer profile defined, create one.
3) Go to manage > Printer profiles
4) Click the 'edit' button on any of the profiles.
5) INTERNAL SERVER ERROR! "Can't use string ("fields") as a HASH ref
while "strict refs" in use at /usr/share/koha/lib/C4/Creators/Lib.pm
line 147"
6) Apply patch
7) Click the 'edit' button on any of the profiles.
8) Things work as expected
Bug reproduced, is fixed by this patch
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit af845c143a4f5a8fb1ea88cac3478ef91a1bdb9c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ae561349fb8856ade637e627c19ad22f0e5dc779
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jun 21 14:49:32 2016 -0400
Bug 4460: Amazon's AssociateID tag not used in links so referred revenue lost
Reworking based on output of:
git grep "gp\/reader"
Additionally, some changes might be in order though gp/reader works.
https://affiliate-program.amazon.com/help/topic/t64/a1
suggests using dp
A dp was discovered, so that part of the URL was left unchanged.
The "/ref..." part was changed to just an Amazon tag ("?tag={AAT}")
if defined.
TEST PLAN
---------
1) Added:
"100 years of Canadian foreign policy /
edited by Robert Bothwell and Jean Daudelin."
2) Added a second book with the word foreign in the title.
3) Waited for reindex
4) Checked out the Canadian foreign policy book.
5) Applied patch
6) Made sure that:
- AmazonAssocTag was set to TEST (easy to notice)
- AmazonCoverImages was set to 'Show'
- OPACAmazonCoverImages was set to 'Show'
7) Searched intranet for 'foreign' to find the detail page
-- hovering over picture shows URL with ?tag=TEST in it.
8) Went to the OPAC Detail page
9) Toggling OPACURLOpenInNewWindow, confirmed that URL for
the picture contained ?tag=TEST in it.
10) Logged into the OPAC
11) Confirmed the URL in the checked out list on your summary
page contained ?tag=TEST in it.
12) Confirmed the URL in the checked out list on your reading
history page contained ?tag=TEST in it.
13) Confirmed links worked (went to expected page)
14) run koha qa test tools
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 463c5a0f25a1e2dfc3331319bd86f17b4114821e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 020429d407039c401e18230d62f41b533ab913fe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue May 2 19:12:49 2017 -0300
Bug 18525: (bug 14828 follow-up) FIX ordering from suggestion when item-level_itypes = biblio
When ordering from a suggestion with item-level_itypes = biblio the app
crashes with
Template process failed: undef error - The method selected is not
covered by tests! at /home/vagrant/kohaclone/C4/Templates.pm line 121.
C4::ItemTypes->all did not set a selected flag. The item type is only
display when ordering (and not modifying an order).
The flag is never set, the test can be removed.
Test plan: Confirm that the error is gone
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9a3ad32e468f2a006a43577031f3aa50b83fb3d8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2203f7d39e4504cfefa2ecb6c160c8f5f0054e7b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 8 12:43:43 2017 -0300
Bug 16758: Use the default cache instance
I do not see a valid reason not to use the default one instead of the
syspref one.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit caa4cccfa09cdf5c9816634194000307ac508578)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f178fd076b90c53f7b45c8f1abbb9df6de5e1122
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date: Wed Sep 14 15:33:07 2016 +0200
Bug 16758 - Caching issues in scripts running in daemon mode
As L1 cache does not have expiration mechanism, scripts running
in daemon mode (rebuild_zebra.pl -daemon, sip server ?, ...) would
not be aware of any possible changes in the data being cached
in upstream L2 cache.
This patch adds ->flush_L1_caches() call in rebuild_zebra.pl
inside daemon mode loop.
To test:
1) apply patch
2) ensure that rebuild_zebra.pl -daemon is still working properly,
without any noticeable performance degradation
3) stop memcached daemon and try to run rebuild_zebra.pl -daemon
again: there should be a warning emitted stating that the script
is running in daemon mode but without recommended caching system
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 84dbc80074b5b1ada05b815cba810e4c5fb10dd2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dcdf1dcdac149e66d691a60c9b63164a76b2dc56
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Apr 28 08:48:50 2017 +0100
BUG 18505: opac-search-history does not respect opacPublic
The opac-search-history page was available regardless of the opacPublic setting, this
patch corrects that.
Test plan, set opacPublic to 'No', test whether opac-search-history page is available
when not logged in, note that it is.
Apply patch, test whether opac-search-history is still available when not logged in,
note that you should be redirected to the login page.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 9d6549d3b61d72d8fb95925837b3a498992c991e
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon May 1 12:46:20 2017 -0400
Bug 18494: Pass a code, not hash & Fix double commas
TEST PLAN
---------
1) prove -v t/db_dependent/Letters.t
-- fails at test 5 or so.
2) apply patch
3) run step 1
-- success
4) run koha qa test tools
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit d756d212444092b5f06b47da22fb0eb9329baf8f
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Wed Mar 8 18:12:59 2017 +0200
Bug 18233 - t/db_dependent/00-strict.t has non-existant resetversion.pl
Removes a warning.
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: Mason James <mtj at kohaaloha.com>
commit 1e1cf2702f2d13cec1d21f7fe5df706d3e988aac
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jan 3 15:08:32 2017 +0000
Bug 17812 - Return focus to barcode field after toggling on-site checkouts
This patch changes the behavior of the checkout form so that after
checking boxes in the "checkout settings" panel the cursor focus is
automatically moved to the barcode field.
To test, apply the patch and enable OnSiteCheckouts and
decreaseLoanHighHolds system preferences.
- Open any patron account in circulation.
- Expand the "Checkout settings" panel.
- Click the label or checkbox for "Automatic renewal", "Don't
decrease checkout length based on holds" and "On-site checkout"
- Confirm that the focus has moved to the barcode field.
Works as advertised.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila at ccsr.qc.ca>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 63866d4b315d74593983a3da32a5c8d5f0c80b85
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 11 11:22:13 2017 -0400
Bug 18415 - Advanced Editor - Rancor - return focus to editor after successful macro
After running a macro we should return focus to the editor screen so
editing can continue from keyboard
To test:
1 - Create a macro
007=vd cvaizq
2 - Run it and note focus is not on editor
3 - Apply patch
4 - Reload page
5 - Run macro
6 - Note focus is returned to editor
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 5d384b9d8cc432e7d3c36735e2765c1ed2e64543
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Mar 27 15:19:24 2017 +0200
Bug 17993 - Do not use modal authentication with CAS - tags bis
Bug 12046 corrected the fact that modal dialog does not allow to use the
CAS authentication in main authentication link. This must also be
corrected in link for tags in detail tags page: "Log in to see your own
saved tags."
Test plan :
- Enable syspref casAuthentication
- Go to OPAC, not authenticated
- Click on "Tag cloud"
- Click on "Log in to see your own saved tags"
=> Without patch you get the modal login popup
=> With patch you go to the login page opac-user.pl
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit bdc4f1757f691d5997d7d9ec44d61de4686609b8
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jan 25 14:47:02 2017 +0100
Bug 17993 - Do not use modal authentication with CAS - tags
Bug 12046 corrected the fact that modal dialog does not allow to use the CAS authentication in main authentication link.
This must also be corrected in link for tags in detail page : "Log in to add tags"
Test plan :
- Enable syspref casAuthentication
- Go to OPAC
- Go to a record detail page opac-detail.pl
- Click on "Log in to add tags"
=> Without patch you get the modal login popup
=> With patch you go to the login page opac-user.pl
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 6cc7197e2e64a23082cbc1e4458c6442051aa97a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jan 25 14:19:16 2017 +0100
Bug 17993 - Do not use modal authentication with CAS - lists
Bug 12046 corrected the fact that modal dialog does not allow to use the CAS authentication in main authentication link.
This must also be corrected in link of lists popup : "Log in to create your own lists"
Test plan :
- Enable syspref casAuthentication
- Go to OPAC
- Click on Lists > Log in to create your own lists
=> Without patch you get the modal login popup
=> With patch you go to the login page opac-user.pl
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit e5603d06918ea7eae0d87ebc8da731b228812fd7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon May 1 14:15:58 2017 +0200
Bug 7550: [QA Follow-up] Resolve param warning from sco-patron-image
Resolve this warning:
CGI::param called in list context from package C4::Service line 212, this can lead to vulnerabilities. See the warning in "Fetching the value or values of a single named parameter" at /usr/share/perl5/CGI.pm line 436.
It comes from the require_params call in sco-patron-image.pl.
Git grepping on require_params tells me this:
members/default_messageprefs.pl:my ($categorycode) = C4::Service->require_params('categorycode');
opac/sco/sco-patron-image.pl:my ($borrowernumber) = C4::Service->require_params('borrowernumber');
opac/sco/sco-patron-image.pl:my ($csrf_token) = C4::Service->require_params('csrf_token');
svc/cataloguing/metasearch:my ( $query_string, $servers ) = C4::Service->require_params( 'q', 'servers' );
The only candidate for multi_param seems to be 'servers', but as we can see
this variable is a scalar. Additional servers returned by require_params are
lost. This should be solved on its own report.
So, we can safely add scalar to the params call, resolve the warning and
keep the same behavior.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
commit bf9cb4bdbce67b5b25ea16924474c773315c5d53
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 19 14:09:12 2017 -0300
Bug 7550: SCO - Restrict access of patron's image
With this patch if SelfCheckoutByLogin is set to 'username and
password', only the logged in user will be able to see the image linked
to his/her logged in account.
If set to "barcode" we generate a token but it can be easily generated.
You should add a warning in the about page if
SelfCheckoutByLogin="barcode" and ShowPatronImageInWebBasedSelfCheck="Show".
How I tested:
- Go to SCO
- Log - Enable self checkout, go to [Your
Server]//cgi-bin/koha/sco/sco-main.pl
- Log in with a user 'A' who has a patron image
- Copy the address of the patron image into an other browser window
- Change the borrowernumber to on of an other user 'B' having a patron
image
- Verify that the patron image is NOT displayed
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit f8a20081322f821bc2843db306d84c93b3d4fcb3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 3 15:30:14 2017 -0300
Bug 18152: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 945838da9ebf66ee8aab07093421fe26174e483e
Author: Stephane Delaune <stephane.delaune at biblibre.com>
Date: Wed Feb 22 12:25:33 2017 +0100
Bug 18152 : fix unimarc label in SetMarcUnicodeFlag
The standard UNIMARC requires than the 9th character (starting from 0) in
labels must be blank (while it may be 'a' in marc21)
the problem is that C4::Charset::SetMarcUnicodeFlag (called in particular when
we import a record) always add 'a' char in the 9th label'pos whereas it should
do it just for MARC21 and NORMARC (not for UNIMARC) :
C4::Charset::SetMarcUnicodeFlag add 'a' char in the 9th label character for
MARC21 and NORMARC (it's normal), but just before doing this it call
"$marc_record->encoding('UTF-8')" which is a MARC::Record function which, when
called with 'UTF-8' parameter, do only one thing : add 'a' char in the 9th
label character
This patch only removes this incorrect function call, so, when we import a bib
record in UNIMARC : it no longer adds erroneous character (this does not change
anything for MARC21 and NORMARC because SetMarcUnicodeFlag explicitly adds 'a'
char in the 9th label for them)
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit dac29f8c12963278a96a2ebaf5ab28597bc61a78
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 21 18:44:05 2017 -0300
Bug 18442: Add a test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 8e872edef33570afa7f075b909e5a96b0d3a5a06
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date: Thu Apr 20 11:29:28 2017 +1200
Bug 18442: Fix DB user loggin
Test plan:
1. Drop and recreate your db
2. Clear memcached
3. Go through the installer (to speed up this test plan install all
sample data so you dont have to create libraries, patron categories etc. later)
4. On the installer page login as the database user and notice that it
does not work on the first attempt ( you get 'Error: You do not have
permission to access this page')
5. Try logging in as database user for a second time and notice you are
logged in successfully this time
4. In staff interface create a patron account with superlibrarian permissions
5. Logout of the staff interface
6. Login as database user
7. Notice you cant log in. You get the 'Error:: You do not have permission to access this
page' error
8. Try a second attempt and notice you get the same error
9. Open the URL in a new tab and notice the staff interface appears
showing that you are logged in
10. log out and log back in as the superlibrarian user you created and
notice it works on first login attempt
11. Apply patch
12. Log out and try logging back in as database user and notice that you
can login successfully on first attempt
13. Repeat steps 1,2,3 and login as database user and notice the login
works on first attempt
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 71f86e4c640ce208e619b03ab572d7ae89e79075
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Apr 24 14:21:00 2017 +0000
Bug 18484 - opac-advsearch.tt missing closing div tag for .container-fluid
This patch corrects HTML validation errors by adding back a missing
</div> which was removed accidentally by Bug 9043 (2014!).
This patch also removes "border" attributes from <img> tags because the
attribute is obsolete.
To test, apply the patch and test the validity of the OPAC's advanced
search page. The only error should be one about 'Bad value
"api-server,"' which isn't really resolvable.
Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit cdc4bc73bfae1d4ee05ca64be8ce31dbcd2f962b
Author: Marc Véron <veron at veron.ch>
Date: Fri Apr 21 21:22:44 2017 +0200
Bug 13835: Popup with searches: results hidden by language menu in footer
Language menus in pop up windows are not necessary and can hide the contents
(especially search results) on a narrow screen.
For an example, see screenshot in comment #3
This patch allows to mark pop p menus not to display the language footer.
To test:
- Reproduce issue from comment #3
- Apply patch
- Try to reproduce issue from comment #3
-> language menu should no longer display
- Verify that language menu is suppresed in 'Add to ist' as well
(from catalog search results, select an item, Add to:...)
Note: There will be more pop-ups with unwnated language selector.
That can be resolved in follow up bugs.
Followed test plan which worked as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 56b2d75e385ab502588a38e4a8e79907a2d52818
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 25 16:16:49 2017 +0000
Bug 18419 - Broken patron-blank image in viewlog.tt
Because of a variable name collision the blank patron image doesn't
display in viewlog.tt. This patch moves the image from the template to
the stylesheet to avoid this problem.
This patch also replaces the blank patron image PNG file with an SVG
file. SVG support is wide enough to begin using whereever possible.
This patch also removes some inline CSS from circ-menu.inc and puts it
in the global stylesheet.
To test, apply the patch and clear your browser cache if necessary.
- Enable the patronimages system preference.
- View a patron account which lacks a patron image. All views (details,
fines, notices, etc) should show the "blank" patron image, including
the modification log view.
- View a patron account which has a patron image and check that it still
displays correctly in all views.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 895767c146e463d231f4cc95a8e45149b5a51359
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Thu Jan 5 02:01:57 2017 +0000
Bug 15738: Show rental fees on OPAC summary page
This patch adds a few lines that check for a rental fee on an item. If
yes, it will show in brackets as a rental fee on the OPAC summary page.
To test:
1) Have a borrower with an overdue item accruing fines, a lost item and
an item with a rental fee. Confirm the Fines column on the OPAC summary
page now shows you what you may expect to see for each item.
Sponsored-by: Catalyst IT
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit b6c22f0bc812b88a3bdba1ea8f751859bc0ed521
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Apr 19 01:03:15 2017 +0000
Bug 18452: Correcting 'url' to say 'URL' in catalog detail
To test:
1) Edit a record, put a URL in 856u and hit save
2) Confirm that url shows as URL in OPAC and staff client
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 919476c7b6d54dd20154f372665a6e8d738f6c16
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Apr 18 23:18:31 2017 +0000
Bug 15815: Reword confirm message when removing patrons from card batch
This patch rewords the confirm message when removing patrons from a card
batch.
From: "Are you sure you want to remove card number(s):1 from this
batch?"
To: "Are you sure you want to remove the selected patron(s) from this
batch?"
To test:
1) Go to Tools -> Patron Card Creator -> Manage batches
2) Edit a batch
3) Select one or more patrons and click 'Remove selected patrons' (not
individual Delete buttons)
4) Confirm the message is worded better and easier to understand
5) Click OK and confirm the patrons are deleted as expected
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit e456d74c595913d237a170de9201c83e1b043dd1
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Jan 19 21:13:47 2017 -0500
Bug 15702: Recommended Counter-patch
As per comment #7, this patch affects AddMember and ModMember.
The test plan should be the same as comment #6.
Secondary patch with tests still to come.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 7fd248f3e9c80b36fb451eb90d2c34242c0cbb61)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7e2e86182f43d656f456370a6d16ba528485e7ca
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Apr 21 08:58:03 2017 -0400
Bug 15702: Add test cases for modified code
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 31378adbe1add83afd2ac77520a295c18ba70b72)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 46c5483c946bbb426801749908287dd2bf893f87
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 24 14:16:34 2017 -0300
Bug 18457: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 41669b45a808550088146380d534e4f3629590d9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Conflicts:
t/db_dependent/Letters.t
commit 41d9456743ed009f7e50992b4b770fc865af39de
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 19 09:52:38 2017 -0400
Bug 18457 - process_message_queue.pl will die if a patron has no sms_provider_id set but sms via email is enabled for that patron
If SMS via Email is enabled, and a patron has opted for SMS messages, but has not selected a service provider, the cronjob will die with the error
Can't call method "domain" on an undefined value at /usr/share/koha/lib/C4/Letters.pm line 1055.
This will cause all messages that come after the error to not be sent!
Test Plan:
1) Enable SMS via Email
2) Enable SMS for a patron, but don't set a provider
3) Perform an action that will trigger an sms message to go into
the holds queue ( item due, item checkout, etc )
4) Run process_message_queue.pl, note the error
5) Apply the patch
4) Run process_message_queue.pl, no error this time!
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c7541091741878d28f648df8681a691cf787334c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit ff14020a2b442efba07daaa0df6ac4e5bf223901
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun May 14 12:35:48 2017 +0000
SCHEMA UPDATE for Bug 17260 - updatedatabase.pl fails on invalid entries in ENUM and BOOLEAN columns
commit bffa27725a848211b1e1dae4142c7bf5fa524117
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 16:53:58 2017 +0100
Bug 18066: Hea V2 [squashed]
This patch is the Koha part of the Hea v2 project.
You can find the (testing) code for the server at
hea-ws - https://github.com/joubu/hea-ws/commits/v2
hea-app - https://github.com/joubu/hea-app/commits/v2
They contain the different pull requests made over the last 6 months.
More information on Hea at https://wiki.koha-community.org/wiki/KohaUsageStat_RFC
The goal of this commit message is to provide an overview of what could
be a new version of Hea.
Prior to these changes, the Hea database was filled with 1 line per Koha
installation. System preferences were filled by the libraries and a
cronjob (share_usage_with_koha_community.pl) collected these values to send
them to a webservice (hea-ws/upload.pl).
With the need to collect more data we would want to collect data at the library
level (branch) and not at the installation level.
For instance the geolocation, the url or the country can be different from one
library to another, even if managed from the same Koha installation.
The Hea DB has been upgraded to reflect that change (see hea-app/sql/schema.sql).
The hidden goal of this patch is to make Hea sexier and explain
better to libraries how it can be useful to share their information
with the Koha community. I guess the main problem is the lack of
communication and explanations about what we are doing we these data.
To fill this gap I'd like to (TODO)
1. Communicate on the ML about this new version of Hea (once it got
pushed and backported)
2. Link the Privacy_Policy.md from the Hea interface
3. Get help from a native English speaker to add
popup/help/info/whatever on "Home › Administration › Usage statistics",
to clearly explain what happens (and what will not happen!) when an option or
another is set.
You can find screenshot of this whole enhancement on bug 18066, comment 2.
What this patch does:
- Create a new branches.geolocation DB field
- Add 3 new sysprefs:
* UsageStatsGeolocation
* UsageStatsLibrariesInfo
* UsageStatsPublicID
- Integrate the Leaflet JS library to get a fancy map to pick
geolocations
How does it works:
On the new administration page where statistics to share are configured,
there are several new things. It is now possible to share information either
per Koha installation or libraries. If UsageStatsLibrariesInfo is set,
the info at library level (url, name, country, geolocation) will be
sent to the Hea webservice. If it is not set, you can decide to fill
UsageStatsLibraryUrl, UsageStatsLibraryName, UsageStatsCountry,
UsageStatsGeolocation to share these information. Note that even if the
data are retrieved at installation level, it's better to fill the prefs
as well: On the Hea website the different libraries defined for a given
Koha installation could be displayed on the same page.
This page is a public page which will be attributed to every
installation (with the pref UsageStatsPublicID). On this page all the
info available publicly will be displayed.
TODO later:
- Add a button on the administration page to delete the info shared
publicly. It will be easy to show that the info are no longer displayed
on the public page.
- Add an icon per Koha installation to get a better "public page"
- Any suggestions?
Test plan:
We will need to test hea-ws, hea-app and the Koha-side code to test the
whole enhancement.
1/ To start, clone the hea-ws and hea-app project and checkout the
'master' branch (*not* 'v2')
2/ Create the hea database and user
CREATE DATABASE hea
CREATE USER 'hea'@'localhost' IDENTIFIED BY 'hea';
GRANT ALL PRIVILEGES ON hea.* TO 'hea'@'localhost';
FLUSH PRIVILEGES;
3/ Fill the DB with some data
mysql hea < hea-app/sql/schema.sql
mysql hea < hea-app/sql/sql/mock-data.sql
4/ Checkout the 'v2' branch for both hea-ws and hea-app
5/ Execute the upgrade DB script
% cd hea-app
% perl -p -i -e 's/REPLACE_ME/hea/' sql/upgrade.pl # Fill the DB info
% perl sql/upgrade.pl
Now the DB is using the v2 structure. That means we have 1 installation
row per library previously defined. 1 library row has also been created.
5/ Configure hea-ws
% echo '192.168.50.1 hea.koha-community.org' >> /etc/hosts
<VirtualHost *:80>
DocumentRoot "/path/to/hea-ws"
ServerName "hea.koha-community.org"
<Directory "/">
Options +ExecCGI
Require all granted
AddHandler cgi-script .pl
</Directory>
</VirtualHost>
And enable it with a2ensite, then restart apache.
The copy the database.yml.sample to database.yml and edit it to fill the
DB info.
6/ Launch the hea-app
% cd hea-app
% edit README.md # to install the missing modules
% cp environments/config.yml environments/development.yml
% edit environments/development.yml # to fill the DB info
% perl bin/app.pl
Then hit localhost:3000
You should see a local version of Hea with sample data
7/ Back to Koha side
A. We will test that the webservice still works with previous version of Koha (without v2)
a. Do not configure Hea
% perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
Then hit localhost:3000
=> Nothing added
b. Configure Hea on admin/usage_statistics.pl
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
=> New library added
c. Modify the Hea configuration
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
=> Info are modified
B. Not we will test that it works with the new version (much more fun ;))
% git checkout hea-v2 # koha
a. Configure Hea using /admin/usage_statistics.pl
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
=> Check the result on localhost:3000
b. Share libraries's info
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
c. Continue to play a bit and share the info.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 9f01cbfe652ee22f3a97dfc3e94f493c6b78e7ab
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 20 22:29:53 2016 +0000
Bug 14608 - HEA : add possibility of sharing usage statistics [squashed]
This patch set adds:
- a reference to Hea at the end of the installation process
- a link to the new page from the admin home page
- a new page to easily configure shared statistics
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +
C4/Charset.pm | 1 -
C4/Letters.pm | 4 +
C4/Members.pm | 16 +
C4/Service.pm | 2 +-
C4/UsageStats.pm | 28 +-
Koha/Schema/Result/Branch.pm | 12 +-
Koha/Schema/Result/SearchField.pm | 8 +-
admin/usage_statistics.pl | 73 +
debian/control.in | 2 +-
debian/docs/koha-translate.xml | 6 +
debian/list-deps | 4 +-
debian/scripts/koha-foreach | 17 +-
debian/scripts/koha-indexer | 14 +-
debian/scripts/koha-plack | 9 +-
debian/scripts/koha-rebuild-zebra | 13 +-
debian/scripts/koha-shell | 18 +-
debian/scripts/koha-sitemap | 12 +-
debian/scripts/koha-start-sip | 23 +-
debian/scripts/koha-stop-sip | 9 +-
debian/scripts/koha-translate | 79 +-
debian/scripts/koha-upgrade-schema | 25 +-
debian/templates/plack.psgi | 17 +-
installer/data/mysql/kohastructure.sql | 5 +-
installer/data/mysql/sysprefs.sql | 4 +
installer/data/mysql/updatedatabase.pl | 22 +
.../intranet-tmpl/lib/leaflet/images/layers-2x.png | Bin 0 -> 1259 bytes
.../intranet-tmpl/lib/leaflet/images/layers.png | Bin 0 -> 696 bytes
.../lib/leaflet/images/marker-icon-2x.png | Bin 0 -> 2586 bytes
.../lib/leaflet/images/marker-icon.png | Bin 0 -> 1466 bytes
.../lib/leaflet/images/marker-shadow.png | Bin 0 -> 618 bytes
koha-tmpl/intranet-tmpl/lib/leaflet/leaflet-src.js |13251 ++++++++++++++++++++
.../intranet-tmpl/lib/leaflet/leaflet-src.map | 1 +
koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.css | 624 +
koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.js | 9 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 18 +
.../prog/en/includes/cateditor-ui.inc | 1 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 8 +-
.../prog/en/includes/country-list.inc | 196 +
.../prog/en/includes/intranet-bottom.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 8 +
.../prog/en/modules/acqui/neworderempty.tt | 6 +-
.../prog/en/modules/admin/admin-home.tt | 2 +
.../prog/en/modules/admin/preferences/admin.pref | 11 +
.../prog/en/modules/admin/usage_statistics.tt | 339 +
.../prog/en/modules/catalogue/detail.tt | 16 +-
.../prog/en/modules/circ/circulation.tt | 8 +-
.../prog/en/modules/common/patron_search.tt | 1 +
.../prog/en/modules/installer/step3.tt | 4 +
.../prog/en/modules/members/member.tt | 4 +
.../prog/en/modules/patroncards/edit-batch.tt | 5 +-
.../en/modules/virtualshelves/addbybiblionumber.tt | 2 +-
.../intranet-tmpl/prog/img/patron-blank.min.svg | 1 +
koha-tmpl/intranet-tmpl/prog/img/patron-blank.png | Bin 1559 -> 0 bytes
.../prog/js/background-job-progressbar.js | 2 +-
.../intranet-tmpl/prog/js/pages/circulation.js | 4 +
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 7 +-
.../bootstrap/en/modules/opac-advsearch.tt | 27 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 20 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 8 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 5 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 9 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 18 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 9 +-
koha-tmpl/opac-tmpl/bootstrap/less/responsive.less | 13 +-
labels/label-edit-profile.pl | 2 +-
misc/cronjobs/share_usage_with_koha_community.pl | 2 +-
misc/migration_tools/rebuild_zebra.pl | 10 +-
opac/opac-search-history.pl | 2 +-
opac/opac-user.pl | 4 +
opac/sco/sco-main.pl | 4 +-
opac/sco/sco-patron-image.pl | 22 +-
reports/bor_issues_top.pl | 7 +-
t/Charset.t | 27 +-
t/db_dependent/00-strict.t | 2 +-
t/db_dependent/Auth.t | 16 +-
t/db_dependent/Letters.t | 18 +-
t/db_dependent/Members.t | 4 +-
t/db_dependent/UsageStats.t | 43 +-
81 files changed, 15060 insertions(+), 171 deletions(-)
create mode 100755 admin/usage_statistics.pl
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/layers-2x.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/layers.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/marker-icon-2x.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/marker-icon.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/marker-shadow.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet-src.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet-src.map
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.css
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/country-list.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/patron-blank.min.svg
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/patron-blank.png
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list