[koha-commits] main Koha release repository branch master updated. v3.20.00-1059-g9708ffa
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 4 16:53:20 CET 2015
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 9708ffa1d3929535620c86063ad82e7aa9f22864 (commit)
via 3efbad2ce953b18091079264a027b4d034dd77b7 (commit)
via f668ca7dae584dd71ae3bf454b4679a4253b5240 (commit)
via 1d2174d8158a34f8dc57826caeebe875322d31fc (commit)
via 78db3adda28257894cb276959dd91215f6fe6f1e (commit)
via 492e5247997f02e6995a2bac044e0dae6112abdb (commit)
via e6127b1bc000827d244f4116193e342c61c8e833 (commit)
via b8891b9275bd2e31a66927f87ef28667b457086e (commit)
via 29e97b85f0f5e0b11a5120c7560bb3bfa9a82898 (commit)
via a39910ecb638cb15ddbbd96874bd48720b54e6e1 (commit)
via 2f6d1e8240192bb501d1f41ed9190fb430640eb9 (commit)
via 7091c6b274b25df13b6779bbcf9545a1f81c8f97 (commit)
via eead133e775392480f92fa8a13eef70d79bad464 (commit)
via dc0c851fc9c7bd0310f9f45b1a9d9a4562aad8a5 (commit)
via 07ddb073415696ef405b5ff1bec4389362be5872 (commit)
via e9ba2c5c53cce788bbbc35c1c31e7c2e772cce8a (commit)
via f0127ddb4daf9952d4614aab6a86831777261c9b (commit)
via 3a4299327b83fdbd7e6246f8c069436fe83e2e79 (commit)
via f143b31d1f8ea5364b0ef3fa33c31e26980381ce (commit)
via f73fdc9ebbc43b983e5c8f08d187cd3d6ac418cc (commit)
via 386d36b3a39bf7e27c6ecb7cf7f31296bd0b13fd (commit)
via 245e71cb064dca6d0b5e94d288d5cfcd03b515c9 (commit)
via b8dd89973877bbb09b6aabe45d8b2e91a7af38b7 (commit)
via 220ff161e9cd3130cb3e1f5a03e882c1868e5143 (commit)
via 7df384c17dfce72f58b8bc02dae8b7c663231894 (commit)
via 5e4077ae912d7ee03a2340ebee6e3286a4e71c0e (commit)
via 88bf1a75dbb3ac20b75a025eb711292c207d525c (commit)
via afc3db4d6876cac1d77449a655d452c4663c6692 (commit)
via 9d82253d0a8393933fa091fb4596df3007c52871 (commit)
via 00900e8a51ca465080f25f61f3eed3bce60dcd9e (commit)
via 3cab4d1efd25268441c88ce74d5a4b568773c8aa (commit)
from 93d93b36377dea05131307106f1e5a9f226d9487 (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 9708ffa1d3929535620c86063ad82e7aa9f22864
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Nov 4 12:45:51 2015 -0300
Bug 12933: DBRev 3.21.00.050
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3efbad2ce953b18091079264a027b4d034dd77b7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Oct 24 20:58:04 2015 +0200
Bug 12933: (QA followup) Add missing notice templates and other small fixes
- Fixes page title of slip print window: Members > Patrons
- Fixes error message if no notice template is found
- Fixes a stray template variable that resulted in the
borrower number showing in the 'Print' pull down
- Fixes xt/sample_notices.t by adding the sample notice to
it-IT and es-ES
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f668ca7dae584dd71ae3bf454b4679a4253b5240
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jan 26 08:39:17 2015 -0500
Bug 12933: (QA followup) Rename GetOverdues to GetOverduesForPatron
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 1d2174d8158a34f8dc57826caeebe875322d31fc
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jan 1 19:18:18 2015 -0500
Bug 12933: (QA followup) Add Unit Tests
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 78db3adda28257894cb276959dd91215f6fe6f1e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jan 1 18:48:03 2015 -0500
Bug 12933: (QA followup) Rename parse_letter to parse_overdues_letter
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 492e5247997f02e6995a2bac044e0dae6112abdb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Dec 16 08:10:02 2014 -0500
Bug 12933: Add new OVERDUES_SLIP letter
Signed-off-by: Amy Purvis <APurvis at galencollege.edu>
Signed-off-by: Laurie McKee <lmckee at littleelm.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit e6127b1bc000827d244f4116193e342c61c8e833
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Sep 16 12:51:13 2014 -0400
Bug 12933: Add ability to print overdue slip from staff intranet
Some librarians would like to be able to print an overdues slip from the
staff intranet. This slip would be defined as the print transport
version of the ODUE slip.
Test Plan:
1) Apply this patch
2) Locate a patron with overdues
3) Define a print version of the OVERDUES_SLIP slip
4) Try Print > Print overdues
Signed-off-by: Amy Purvis <APurvis at galencollege.edu>
Signed-off-by: Laurie McKee <lmckee at littleelm.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b8891b9275bd2e31a66927f87ef28667b457086e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Oct 31 11:57:42 2015 -0300
Bug 15095: marc_modificacation_template_actions DB not consistent between fresh and updated DB
A review of the 3.20.00 + upgrade DB, compared to a fresh master install
highlighted an inconsistency on that table. This is mysqldbcompare's
output for it:
- `action` enum('delete_field','update_field','move_field','copy_field','copy_and_replace_field') COLLATE utf8_unicode_ci DEFAULT NULL,
? ------------------------- ^^^^^^
+ `action` enum('delete_field','update_field','move_field','copy_field') COLLATE utf8_unicode_ci NOT NULL,
So one ENUM value is missing on fresh installs, and an upgraded one
yields a DEFAULT NULL configuration for the 'action' column.
To test:
1) have a v3.20.00 DB:
> CREATE DATABASE koha_master_upgraded;
$ git checkout v3.20.00
$ mysql koha_master_upgraded < installer/data/mysql/kohastructure.sql
2) upgrade it to latest master by running:
$ git checkout origin/master
$ perl installer/data/mysql/updatedatabase.pl
3) Create a new DB
> CREATE DATABASE koha_master_fresh;
$ mysql koha_master_fresh < installer/data/mysql/kohastructure.sql
4) Run mysqldbcompare (you need mysql-utilities installed for that)
$ mysqldbcompare --difftype=differ --server1=root at localhost \
--skip-data-check --skip-table-options \
--run-all-tests koha_master_upgraded:koha_master_fresh
=> FAIL: You will notice the marc_modification_template_actions discrepancy
- Repeat from 1), but apply this patch on 2) before the upgrade.
=> SUCCESS: The DB's discrepancies are now irrelevant [1]
- Sign off :-D
[1] Only KEY definition order is 'wrong', but it is not relevant.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 29e97b85f0f5e0b11a5120c7560bb3bfa9a82898
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Nov 4 12:09:28 2015 -0300
Bug 11431: DBRev 3.21.00.049
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a39910ecb638cb15ddbbd96874bd48720b54e6e1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Nov 4 10:08:39 2015 -0500
Bug 11431: (QA followup) Make audio alerts sql top level
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 2f6d1e8240192bb501d1f41ed9190fb430640eb9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Oct 24 12:01:52 2015 +0200
Bug 11431: (QA followup) Typo in help file / variable name
Fixes the variable name to avoid a double-up that made it
impossible to turn off the sounds in general. If AudioAlerts
are turned off, they will only work on the audio administration
page now so you can set up and test the different sounds there.
Also fixes a little typo in the help file.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7091c6b274b25df13b6779bbcf9545a1f81c8f97
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 23 07:55:18 2015 -0400
Bug 11431: (QA followup) Add ability to edit audio alerts
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit eead133e775392480f92fa8a13eef70d79bad464
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 23 08:15:45 2015 -0400
Bug 11431: (QA followup) Update help
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dc0c851fc9c7bd0310f9f45b1a9d9a4562aad8a5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 23 07:05:23 2015 -0400
Bug 11431: (QA followup) Always allow audio alerts for audio alerts editor page
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 07ddb073415696ef405b5ff1bec4389362be5872
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Sep 18 06:36:10 2015 -0400
Bug 11431: (QA followup) Fix alter precedences on delete
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e9ba2c5c53cce788bbbc35c1c31e7c2e772cce8a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Sep 17 11:04:09 2015 -0400
Bug 11431: (QA followup) Hard code list of sounds for security
The sounds directory is no longer available for listing for security.
It is better and safer to hard code the list of sounds.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f0127ddb4daf9952d4614aab6a86831777261c9b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Sep 17 10:48:24 2015 -0400
Bug 11431: (QA followup) Move AudioAlerts to a separate plugin
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3a4299327b83fdbd7e6246f8c069436fe83e2e79
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 19 07:57:17 2015 -0400
Bug 11431: (QA followup) Simplify audio_alert_id to just id
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f143b31d1f8ea5364b0ef3fa33c31e26980381ce
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 19 07:55:31 2015 -0400
Bug 11431: (QA followup) Unit Tests
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f73fdc9ebbc43b983e5c8f08d187cd3d6ac418cc
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Aug 18 14:23:12 2015 -0400
Bug 11431: (QA followup) Fix js error
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 386d36b3a39bf7e27c6ecb7cf7f31296bd0b13fd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 30 07:12:36 2015 -0400
Bug 11431: Update UsageStats.pm
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 245e71cb064dca6d0b5e94d288d5cfcd03b515c9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Apr 27 07:53:25 2015 -0400
Bug 11431: (QA followup) Fix POD
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b8dd89973877bbb09b6aabe45d8b2e91a7af38b7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Apr 27 07:49:50 2015 -0400
Bug 11431: (QA followup) Allow https in sound URLs
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 220ff161e9cd3130cb3e1f5a03e882c1868e5143
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Dec 22 05:58:48 2014 -0500
Bug 11431: Add additional sound options
This patch set replaces and extends Koha's current sound options.
This is implemented be removing the existing sound system, and
re-engineering using a table of selector/sound combinations such that
the highest precedence selector that is found in the DOM will trigger
and audio alert. The existing audio behaviors are implemented as a set
of default audio alerts.
Test Plan:
1) Apply this patch set
2) Run updatedatabase.pl
3) Enable the AudioAlerts system preference
4) Test existing sounds
5) Enter the new alerts editor in the admin section
6) Add a new audo alert with the following selector:
"body:contains('Check in message')",
choose any sound alert you wish, make sure it's not one of the 3
sounds already used! Make this selector precedence 1
4) Browse to the checkins page, you should hear the default sound
5) Attempt to return an invalid barcode, you should hear your custom sound!
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7df384c17dfce72f58b8bc02dae8b7c663231894
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Dec 22 05:58:09 2014 -0500
Bug 11431: DBIC update schema
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5e4077ae912d7ee03a2340ebee6e3286a4e71c0e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Dec 22 05:57:21 2014 -0500
Bug 11431: Add audio alerts to installer
http://bugs.koha-community.org/show_bug.cgi?id=11431
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 88bf1a75dbb3ac20b75a025eb711292c207d525c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Dec 22 05:56:33 2014 -0500
Bug 11431: Update database
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit afc3db4d6876cac1d77449a655d452c4663c6692
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Nov 4 09:34:11 2015 -0500
Bug 15081: (QA followup) Fix issue with Barcodes_ValueBuilder.t
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9d82253d0a8393933fa091fb4596df3007c52871
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sun Nov 1 16:39:37 2015 -0300
Bug 15081: (followup) Make test files using TestBuilder handle their transactions
This trivial patch introduces the code needed on the test files so they handle
the DB transaction instead of relying on the (removed) transaction started/rolled back
by TestBuilder.
Tested all of the files before and after applying the patch, resultes are the same.
(Pass exept of t/db_dependent/Barcodes_ValueBuilder.t, this has the same error).
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 00900e8a51ca465080f25f61f3eed3bce60dcd9e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Oct 31 12:29:09 2015 -0300
Bug 15081: Take transaction handling out from TestBuilder
This patch removes transaction handling code from TestBuilder.
It fixes the TestBuilder.t to handle the transaction on its own.
Verify that t/db_dependent/TestBuilder.t passes.
Followed test plan, TestBuilder.t passes
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3cab4d1efd25268441c88ce74d5a4b568773c8aa
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Nov 4 12:09:06 2015 -0300
Bug 14978: (RM followup) DBIx update
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer.pm | 1 +
C4/Members.pm | 20 +++
C4/Overdues.pm | 71 ++++++++
C4/UsageStats.pm | 2 +-
Koha.pm | 2 +-
Koha/{Config/SysPref.pm => AudioAlert.pm} | 33 +++-
Koha/AudioAlerts.pm | 157 ++++++++++++++++++
Koha/Object.pm | 3 +-
Koha/Schema/Result/AudioAlert.pm | 81 +++++++++
Koha/Schema/Result/Issue.pm | 18 +-
Koha/Schema/Result/Item.pm | 12 +-
Koha/Template/Plugin/{Biblio.pm => AudioAlerts.pm} | 21 +--
Koha/Template/Plugin/Borrowers.pm | 12 +-
Koha/Template/Plugin/Koha.pm | 6 +-
admin/audio_alerts.pl | 68 ++++++++
circ/circulation.pl | 2 +-
circ/returns.pl | 2 +-
installer/data/mysql/audio_alerts.sql | 4 +
.../data/mysql/de-DE/mandatory/sample_notices.sql | 6 +
.../data/mysql/en/mandatory/sample_notices.sql | 6 +
.../data/mysql/es-ES/mandatory/sample_notices.sql | 6 +
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 6 +
installer/data/mysql/it-IT/necessari/notices.sql | 6 +
installer/data/mysql/kohastructure.sql | 16 +-
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 6 +
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 6 +
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 6 +
installer/data/mysql/sysprefs.sql | 2 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 6 +
installer/data/mysql/updatedatabase.pl | 44 ++++-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 1 +
.../prog/en/includes/doc-head-close.inc | 48 ++++--
.../prog/en/includes/intranet-bottom.inc | 1 +
.../prog/en/includes/members-toolbar.inc | 9 +
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 7 +
.../prog/en/modules/admin/admin-home.tt | 2 +
.../prog/en/modules/admin/audio_alerts.tt | 175 ++++++++++++++++++++
.../en/modules/admin/preferences/circulation.pref | 7 -
.../en/modules/admin/preferences/staff_client.pref | 6 +
.../prog/en/modules/circ/circulation.tt | 15 +-
.../prog/en/modules/circ/printslip.tt | 10 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 41 +----
.../prog/en/modules/help/admin/audio_alerts.tt | 31 ++++
members/print_overdues.pl | 67 ++++++++
misc/cronjobs/overdue_notices.pl | 73 +-------
t/db_dependent/Accounts.t | 4 +-
t/db_dependent/AudioAlerts.t | 133 +++++++++++++++
t/db_dependent/Barcodes_ValueBuilder.t | 26 +++
t/db_dependent/Borrower_Discharge.t | 25 ++-
t/db_dependent/Category.t | 11 ++
t/db_dependent/Circulation/AnonymiseIssueHistory.t | 28 ++++
t/db_dependent/Circulation/TooMany.t | 24 ++-
t/db_dependent/Circulation_dateexpiry.t | 12 ++
t/db_dependent/Exporter/Record.t | 43 +++--
t/db_dependent/Holds.t | 14 +-
t/db_dependent/Holidays.t | 9 +-
t/db_dependent/Items.t | 4 +-
t/db_dependent/Items/MoveItemFromBiblio.t | 7 +
t/db_dependent/Koha/Cities.t | 11 ++
t/db_dependent/Members/GetOverdues.t | 63 +++++++
.../Members/GetUpcomingMembershipExpires.t | 14 +-
t/db_dependent/Reserves/GetReserveFee.t | 12 +-
t/db_dependent/TestBuilder.t | 9 +
t/lib/TestBuilder.pm | 13 +-
64 files changed, 1364 insertions(+), 222 deletions(-)
copy Koha/{Config/SysPref.pm => AudioAlert.pm} (62%)
create mode 100644 Koha/AudioAlerts.pm
create mode 100644 Koha/Schema/Result/AudioAlert.pm
copy Koha/Template/Plugin/{Biblio.pm => AudioAlerts.pm} (66%)
create mode 100755 admin/audio_alerts.pl
create mode 100644 installer/data/mysql/audio_alerts.sql
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/audio_alerts.tt
create mode 100755 members/print_overdues.pl
create mode 100755 t/db_dependent/AudioAlerts.t
create mode 100644 t/db_dependent/Members/GetOverdues.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list