[koha-commits] main Koha release repository branch master updated. v3.18.00-885-g721b37c
Git repo owner
gitmaster at git.koha-community.org
Mon May 4 16:44:42 CEST 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 721b37c9d94d8ed5345f8d9ed50257e4b9644e57 (commit)
via da36c55bb2ad3bc12c1f82f9751a043666897a95 (commit)
via 0e74f0370624f9ab01fccfe27d37403ed1686ad9 (commit)
via 881b6fbf40c70516dd46f31c8de99f0e203c1355 (commit)
via 006bae1b7f797824757e0e5c7fa04a42cd33e696 (commit)
via 2e9c66ba5b39a5c2205e2a4c348b35b9edab958c (commit)
via 44a12de96197d160823b71edc2f53b1dec9ab1e2 (commit)
via eafec2d6a73658cf931d1f5b559afdfb0bc91cd5 (commit)
via 0064ed1741849067215a40174478ed0f2f8f17b2 (commit)
via 44be27b860cde2c91695ca56e50ed4c3fe0375ec (commit)
via 2e4ea0a0740a69af9d9e3cc65a7498b2aa7f0498 (commit)
via a9f47539ec94ee93752513f960e6e9cb014ba6b8 (commit)
via a9a8abb32f0cb1b7eb8acfc2ff1d97bc1181c64a (commit)
via 00faa967bd011cacb6e274b7fa283e289920ad7c (commit)
via df87f507d91be8458f8bd0fc1024afa2b7424762 (commit)
via 8e0cb870d539a8a0532da73fc8fd8b04ecf0776e (commit)
via 2d67a705a27d99fae05297ded260912cecbfbea4 (commit)
via 645d9085168c52d54216086bafcc554b5a489ee8 (commit)
from 93c875f603e60d17403673de3214decd73356823 (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 721b37c9d94d8ed5345f8d9ed50257e4b9644e57
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Apr 20 15:13:44 2015 +0200
Bug 14011: Make the jQuery selector explicit
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit da36c55bb2ad3bc12c1f82f9751a043666897a95
Author: Marc Véron <veron at veron.ch>
Date: Sun Apr 19 20:24:05 2015 +0200
Bug 14011: Triggering slip print with enter key collides with 'barcode submitted'
To reproduce:
- Log into staff client
- Find a client with 0 checkouts
- Print a slip (or cancel printing it)
- Attempt to type in a barcode to checkout
-- annoying modal screen pops up
'barcode submitted' message will be triggered each time
you try
To test:
- apply patch
- try to reproduce issue
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0e74f0370624f9ab01fccfe27d37403ed1686ad9
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon May 4 11:41:33 2015 -0300
Bug 13810: DBRev 3.19.00.037
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 881b6fbf40c70516dd46f31c8de99f0e203c1355
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Apr 27 12:38:40 2015 +0200
Bug 13810: Change collate for tagsubfield (utf8_bin)
Before bug 11944, the marc_subfield_structure.tagsubfield column had a
specific collate: utf8_bin. It has been introduced by
commit 67e20d82ffdfcd69344ec30696bebc51c00d863c
Date: Sun Jun 22 16:35:48 2008 -0500
DB Bump 094 - bug 2268 -- allow mixed case subfield labels in MARC21
by changing db column collation.
This change should be kept and Koha should continue to allow and create
subfields with the same letter but different case sensitivity.
What does this patch:
1/ To prevent the updatedatabase entry 3.19.00.006 to fail if subfields
with different case sensitivity already exist in the DB, the table is
managed separately from others.
2/ To update DB which have already pass this dbrev, a new entry will be
create to update the specific collate for this column.
Test plan:
1/ a. With a 3.18 DB, create subfield 'a' and 'A' for the same field
b. Execute the updatedatabase.pl script. 3.19.00.006 should not fail
anymore
2/ a. With a master DB (3.19.00.006 has already been executed), create
subfields 'a' and 'A'. You should get an error.
b. Apply this patch, execute the DB entry and try again 2/a. you
should be able to create the second subfield.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 006bae1b7f797824757e0e5c7fa04a42cd33e696
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 29 10:15:50 2015 +0200
Bug 14069: Drop existing primary key on items if exists
On old databases, the issues table has a primary key on itemnumber.
The DBrev 3.19.00.028 (Bug 13790 - Add unique id issue_id to issues and
oldissues tables) has to remove it before adding the new primary key
Test plan:
1/ Make sure you have an old DB, or add primary key (issues.itemnumber)manually
on a DB created before 3.19.00.028.
2/ Execute the updatedatabase.pl script
3/ You should not get any error and the primary key on itemnumber should
have been removed and the new one created as expected.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No koha-qa errors
Tested using a 3.4 db (3.0404000)
Interestingly, it gives a similar error on the same table but
on another (older $DBversion = "3.05.00.009";) update
1) Pre-patch, 3.4 DB, updatedatabase from master, errors
(older)
DBD::mysql::db do failed: Multiple primary key defined at installer/data/mysql/updatedatabase.pl line 4435.
(13790)
DBD::mysql::db do failed: Multiple primary key defined at installer/data/mysql/updatedatabase.pl line 10166.
DBD::mysql::db do failed: Unknown column 'issue_id' in 'order clause' at installer/data/mysql/updatedatabase.pl line 10170.
DBD::mysql::st execute failed: Unknown column 'me.issue_id' in 'field list' at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1593.
DBIx::Class::ResultSetColumn::max(): Unknown column 'me.issue_id' in 'field list' at installer/data/mysql/updatedatabase.pl line 10174
2) Post-patch, same conditions
(only older)
DBD::mysql::db do failed: Multiple primary key defined at installer/data/mysql/updatedatabase.pl line 4435.
There are other warnings, but nor related with keys.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2e9c66ba5b39a5c2205e2a4c348b35b9edab958c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 22 10:47:15 2015 +0200
Bug 13887: Display the due date as a due date + sort on info
The due dates should be displayed as due dates :)
i.e not displayed with 23:59
On the way, this patch fixes the sort on the info column.
The column is now sorted using the due dates
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
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 gmail.com>
commit 44a12de96197d160823b71edc2f53b1dec9ab1e2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 22 10:39:19 2015 +0200
Bug 13887: Move the caption into a h2
With the DT filter, the caption is between the table and the filter.
It looks better with the caption as a h2 on top of the table.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
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 gmail.com>
commit eafec2d6a73658cf931d1f5b559afdfb0bc91cd5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 22 10:39:09 2015 +0200
Bug 13887: Fix sDom to display what is needed in the table
1/ Add the information 'showing x to y of z'
2/ Remove some lost pixels
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
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 gmail.com>
commit 0064ed1741849067215a40174478ed0f2f8f17b2
Author: Nick Clemens <nick at quecheelibrary.org>
Date: Tue Apr 21 21:07:59 2015 -0400
Bug 13887: Tab fix and "intranet-tmpl" to "[% interface %]"
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 44be27b860cde2c91695ca56e50ed4c3fe0375ec
Author: Nick Clemens <nick at quecheelibrary.org>
Date: Sat Mar 21 13:41:21 2015 -0400
Bug 13887: Add datatables to item specific holds table
This patch adds datatables functionality to the item specific holds table
To test:
1 - Apply patch
2 - Attempt to place an item specific hold for a patron
3 - Note that columns are now sortable and searchable
4 - Ensure that you can place both specific and next available holds as before
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2e4ea0a0740a69af9d9e3cc65a7498b2aa7f0498
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon May 4 11:16:33 2015 -0300
Bug 13889: DBRev 3.19.00.036
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a9f47539ec94ee93752513f960e6e9cb014ba6b8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 23 07:51:30 2015 -0400
Bug 13889: (QA followup) Supress warning, set object column to undef instead of 0
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a9a8abb32f0cb1b7eb8acfc2ff1d97bc1181c64a
Author: Marc Véron <veron at veron.ch>
Date: Tue Apr 21 17:19:06 2015 +0200
Bug 13889: Provide parameter $infos in cronlogaction()
(Alternative for patch Bug 13889: Log with parameters)
To test:
- Apply patches interactive and skip following patch: Bug 13889: Log with parameters
- Tweak a cron job in order to call cronlogaction twice, one with a param at the beginning of the cron ob, e.g.
cronlogaction("This is my message") and one without param.
- Run this cron job.
Result: You should have two entries in the log, one with and one without additional information after the path and name of the calling script.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 00faa967bd011cacb6e274b7fa283e289920ad7c
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Apr 20 04:32:06 2015 -0400
Bug 13889: Add unit tests
Previous commit was lacking test coverage of new function.
TEST PLAN
---------
1) Apply all the patches
2) prove -v t/db_dependent/Log.t
-- should be success.
3) koha qa test tools
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 gmail.com>
commit df87f507d91be8458f8bd0fc1024afa2b7424762
Author: Marc Véron <veron at veron.ch>
Date: Sun Mar 22 13:55:00 2015 +0100
Bug 13889: Add information about cron jobs to system log
This patch adds information about cron jobs performed and make it viewable
under Home > Tools > Logs ("Browse system logs")
To test:
Apply patch
- Got to system preferences and set 'CronjobLog' to: [Log] information from
cron jobs.
- Run some cron jobs
- Go to Home > Tools > Logs
- Verify that you have a selection 'Cron jobs' in drop-down 'Module'. Select it
with Action "All" and Submit.
- Output should show Date/time and info about Cron jobs
Rebased to work on top of Bug 6911 (conflict in viewlog.tt) /MV
Rebased after applying patch for Bug 6911 /MV
Conflicts resolved:
misc/cronjobs/overdue_notices.pl
misc/cronjobs/cleanup_database.pl
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
- Merge both patches, and fix updatedatabase.pl
- Works as described. Provide intersting feedback from cronjob scripts.
--
Modified version taking in account syspref CronJobLog. Handling simplified by introducing a convenience sub cronlogaction in C4/Log.pm /MV
Amended to take in account comments #11, #12, #13 /MV
http://bugs.koha-community.org/show_bug.cgi?id=13899
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8e0cb870d539a8a0532da73fc8fd8b04ecf0776e
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon May 4 11:01:55 2015 -0300
Bug 13886: (QA followup) only show merge button on search results
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2d67a705a27d99fae05297ded260912cecbfbea4
Author: Nicole <nicole at bywatersolutions.com>
Date: Sun Mar 29 15:15:16 2015 -0500
Bug 13886: (QA followup) Remove tabs
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 645d9085168c52d54216086bafcc554b5a489ee8
Author: Nick Clemens <nick at quecheelibrary.org>
Date: Sat Mar 21 11:31:14 2015 -0400
Bug 13886: Add ability to merge records directly from cataloging search
This patch adds a merge button and checkboxes to the cataloging search results screen to allow librarians to merge directly from these reults
To test:
1 - Apply patch
2 - Perform a cataloging search
3 - Try to select 1 or more than 2 records to merge and check that you get an error
4 - Select 2 records to merge and confirm the correct records are passed to the merge tool
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 2 +
C4/Log.pm | 26 ++-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 47 ++++-
.../prog/en/modules/admin/preferences/logs.pref | 6 +
.../prog/en/modules/cataloguing/addbooks.tt | 37 +++-
.../prog/en/modules/circ/circulation.tt | 11 +-
.../prog/en/modules/reserve/request.tt | 194 +++++++++++---------
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +-
kohaversion.pl | 2 +-
misc/cronjobs/advance_notices.pl | 4 +
misc/cronjobs/automatic_renewals.pl | 3 +
misc/cronjobs/batch_anonymise.pl | 3 +
misc/cronjobs/build_browser_and_cloud.pl | 4 +
misc/cronjobs/cart_to_shelf.pl | 3 +
misc/cronjobs/cleanup_database.pl | 5 +-
misc/cronjobs/cloud-kw.pl | 3 +-
misc/cronjobs/delete_expired_opac_registrations.pl | 3 +
misc/cronjobs/delete_patrons.pl | 3 +
.../delete_unverified_opac_registrations.pl | 3 +
misc/cronjobs/fines.pl | 3 +
misc/cronjobs/gather_print_notices.pl | 3 +
misc/cronjobs/holds/auto_unsuspend_holds.pl | 3 +
misc/cronjobs/holds/build_holds_queue.pl | 3 +
misc/cronjobs/holds/cancel_expired_holds.pl | 3 +
misc/cronjobs/j2a.pl | 3 +
misc/cronjobs/longoverdue.pl | 3 +
misc/cronjobs/overdue_notices.pl | 5 +-
misc/cronjobs/process_message_queue.pl | 3 +
misc/cronjobs/purge_suggestions.pl | 2 +
misc/cronjobs/runreport.pl | 3 +
misc/cronjobs/serialsUpdate.pl | 3 +
misc/cronjobs/share_usage_with_koha_community.pl | 3 +
misc/cronjobs/staticfines.pl | 3 +
misc/cronjobs/update_totalissues.pl | 3 +
reserve/request.pl | 2 +-
t/db_dependent/Log.t | 27 ++-
37 files changed, 326 insertions(+), 112 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list