[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.20-31-g4843687
Git repo owner
gitmaster at git.koha-community.org
Wed May 10 16:36:55 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, 3.22.x has been updated
via 4843687625e0d0e68a583966715ced137d11b228 (commit)
via 43784271459d3c94c523c74f30311923173e4d61 (commit)
via a5f0541dac28b806a14a1b093482ecac6a88f2be (commit)
via af3dd35910a1baacface3a46b156fe6cdc142da1 (commit)
via c2509c5ae1a678b3564f00e8bbd57981d404344d (commit)
via 91ec3e77f1b5e6795fc3a7a200fb9f183109973b (commit)
via 686a94972cc48d082be761d20172b843d0d590bd (commit)
via f02ac251aa072d300f3d887e9c019d1bb6a6f4e6 (commit)
via 061318fffca184a24905e1b6428db7964bc4ce6a (commit)
via 6c96189c0d1d8b6cd581e6d6397ce53d8742d4b8 (commit)
via 966cb233f7cc0a2c86ab1000753228afaa8249ba (commit)
via 62ab4d07c53af72e5e58a1cd6b53c86ccfd857ab (commit)
via ffb4d00def180d7f4affffd979ed414e67f53ce3 (commit)
via 7ac27d1e31dc8b6a58aaef2e989ec112592c90aa (commit)
via c450326ff8c79f88e4cc01321926e36ad4f44ae2 (commit)
from 4ed2e5e0ed8aaf902106a5312500eb1ab5598d98 (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 4843687625e0d0e68a583966715ced137d11b228
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 23 13:32:34 2017 -0300
Bug 18066: Update DBIx::Class Schema
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 43784271459d3c94c523c74f30311923173e4d61
Author: Brendan A Gallagher <brendan at bywatersolutions.com>
Date: Thu Mar 23 00:18:10 2017 +0000
Bug 18066: Update DB rev (3.22.20.001)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit a5f0541dac28b806a14a1b093482ecac6a88f2be
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 24 16:26:31 2017 -0300
Bug 18066: Remove warnings from translate script
This patch removes the following warnings:
Use of uninitialized value $pref_name in concatenation (.) or string at
LangInstaller.pm
(cherry picked from commit bcc04652762ff097623630432946ca9203f7519f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit af3dd35910a1baacface3a46b156fe6cdc142da1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 23 13:31:24 2017 -0300
Bug 18066: Add the new geolocation column to kohastructure.sql
(cherry picked from commit 64812347c9536340484f17758c6881ca882987d6)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit c2509c5ae1a678b3564f00e8bbd57981d404344d
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Mar 21 12:01:45 2017 +0100
Bug 18066: Fix map positioning in admin/usage_statistics.pl
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit c3db243ad459782362c7051a648730bc51fda83d)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 91ec3e77f1b5e6795fc3a7a200fb9f183109973b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 21 07:21:38 2017 -0300
Bug 18066: Fix tests
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 7aff8696614604960b7244fac798a28c4438fc36)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 686a94972cc48d082be761d20172b843d0d590bd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 28 17:13:07 2017 +0000
Bug 18066: Use https for ws
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>
(cherry picked from commit c302fd2bea710c960db7bc14aeac762c865f677a)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit f02ac251aa072d300f3d887e9c019d1bb6a6f4e6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 28 11:16:56 2017 +0000
Bug 18066: Do not use token for OSM tiles
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>
(cherry picked from commit 0d479976af81df3a66024e4ffc18ecc2038c0103)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 061318fffca184a24905e1b6428db7964bc4ce6a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 7 09:31:28 2017 +0100
Bug 18066: Add the leaflet library
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>
(cherry picked from commit f3c4c7016128e6550230cd44f8efedf0374db25e)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 6c96189c0d1d8b6cd581e6d6397ce53d8742d4b8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 16:53:58 2017 +0100
Bug 18066: Hea V2
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>
(cherry picked from commit 63a1adff9097493be0329aebab5fb3bf8a627b80)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 966cb233f7cc0a2c86ab1000753228afaa8249ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Mar 12 19:54:58 2017 -0300
Bug 14608: Move country list to an include file
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 6b626b64944dff0ba0adff99da26e3bbe8eb7544)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 62ab4d07c53af72e5e58a1cd6b53c86ccfd857ab
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jan 13 13:33:05 2017 -0500
Bug 14608: Follow up on labels and search box
This addresses concerns raised in comment #26 and comment #27.
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>
(cherry picked from commit ffbeae312bb472a58adf33e13b8c3d5f9124f0af)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit ffb4d00def180d7f4affffd979ed414e67f53ce3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 20 22:31:41 2016 +0000
Bug 14608: Add a reference to Hea at the end of the installer process
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>
(cherry picked from commit 384b69462e6005e316680b88de304095a39a318b)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 7ac27d1e31dc8b6a58aaef2e989ec112592c90aa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 20 22:31:25 2016 +0000
Bug 14608: Add a link from the admin home page
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>
(cherry picked from commit 601312c6c80e82837869b4eb2c91686c6a1361b3)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit c450326ff8c79f88e4cc01321926e36ad4f44ae2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 20 22:29:53 2016 +0000
Bug 14608: Add a page to configure shared statistics
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>
(cherry picked from commit 3d46c0c7bb8ce487f85cd0d0233cb7ceffcbbde3)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/UsageStats.pm | 28 +-
Koha.pm | 2 +-
Koha/Schema/Result/Branch.pm | 12 +-
admin/usage_statistics.pl | 73 +
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/sysprefs.sql | 3 +
installer/data/mysql/updatedatabase.pl | 32 +
.../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 +
.../prog/en/includes/country-list.inc | 196 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +
.../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/installer/step3.tt | 4 +
misc/cronjobs/share_usage_with_koha_community.pl | 2 +-
t/db_dependent/UsageStats.t | 43 +-
24 files changed, 14609 insertions(+), 27 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
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list