[koha-commits] main Koha release repository branch master updated. v16.11.00-676-g2b0b5d6
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 31 13:54:27 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, master has been updated
via 2b0b5d68de77f977e894dc69a379b1c8f4034eea (commit)
via 1901af692a97a81daed2c1c6f48232ef862172ef (commit)
via b7735ed1281e959c3df34581e13e4276e53fd8a3 (commit)
via d4c3bbb597f19b5dbdf75227dbd67923bb832d85 (commit)
via 4fc3ccf61d04f8b04e2dac0527130fe074f863e3 (commit)
via b0dc5fc0f32a26c24b6e9da91da6ab2ffda0e2c2 (commit)
from 83a7ab21f320b7f7cfe8b3b6b1ab8f6895fe8180 (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 2b0b5d68de77f977e894dc69a379b1c8f4034eea
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 17 08:10:43 2017 +0100
Bug 15498: [QA Follow-up] Additional changes
Adds ExportRemoveFields to sysprefs.sql
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 1901af692a97a81daed2c1c6f48232ef862172ef
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 17 10:13:32 2017 +0000
Bug 15498: Fix conflict with bug 17394
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit b7735ed1281e959c3df34581e13e4276e53fd8a3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 2 10:31:43 2016 +0000
Bug 15498: Fix show/hide csv profile list
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit d4c3bbb597f19b5dbdf75227dbd67923bb832d85
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 2 08:42:11 2016 +0000
Bug 15498: Do not display sql csv profiles
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 4fc3ccf61d04f8b04e2dac0527130fe074f863e3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 6 16:36:54 2016 +0000
Bug 15498: Add ExportCircHistory and remove ExportWithCsvProfile
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit b0dc5fc0f32a26c24b6e9da91da6ab2ffda0e2c2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 2 08:28:01 2016 +0000
Bug 15498: Let the user choose the CSV profile to export circ history
The way the export options are displayed at the bottom of the checkouts table
was not consistent.
Prior to this patch set, they are display if ExportRemoveFields or
ExportWithCsvProfile is set.
It does not make any sense, the user could want to export the checkouts in
iso2709 format without having to define a csv profile and fill the pref.
Moreover the behavior of this pref did not match its description: it's used as
a default CSV profile when exporting records from the export tools or the
command line.
This patch set adds a new pref ExportCircHistory and remove
ExportWithCsvProfile. The new pref is set if ExportWithCsvProfile or
ExportRemoveFields were set.
A new dropdown list with the CSV profile list will be displayed in the
export area, at the bottom of the checkouts table.
Note that now --csv_profile_id is mandatory for the export command line
(misc/export_records.pl) if the export format is csv.
Test plan:
0/ Do not execute the DB entry
1/ Clear both ExportWithCsvProfile and ExportRemoveFields prefs
2/ Execute the DB entry
3/ ExportCircHistory should not be set and the export options should not
be displayed at the bottom of the checkouts table.
4/ Remove the pref
DELETE FROM systempreferences WHERE variable='ExportCircHistory';
and reinsert the previous one, with a value:
INSERT INTO systempreferences (variable, value) VALUES
('ExportWithCsvProfile', 'something');
Execute the DB entry again
=> The now pref should be now set
5/ Export some checkouts using the CSV entry
6/ Note that the export tool and commandline script still work using the
csv format. You have to provide a --csv_profile_id option to make it
work.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Exporter/Record.pm | 10 +++-------
circ/circulation.pl | 5 +++++
installer/data/mysql/atomicupdate/bug_15475.sql | 6 ++++++
installer/data/mysql/sysprefs.sql | 2 ++
.../intranet-tmpl/prog/en/includes/checkouts-table.inc | 11 +++++++++--
.../prog/en/modules/admin/preferences/circulation.pref | 8 +++++---
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 5 +----
.../intranet-tmpl/prog/en/modules/help/circ/circulation.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/moremember.tt | 5 +----
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 10 ++++++++++
members/moremember.pl | 5 +++++
misc/export_records.pl | 9 +++------
tools/export.pl | 6 ------
13 files changed, 51 insertions(+), 33 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_15475.sql
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list