From 063dc8e1f152410cda20c66f48c5c02e9328dde1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Jan 2016 16:36:54 +0000 Subject: [PATCH] Bug 15498: Add ExportCircHistory and remove ExportWithCsvProfile Signed-off-by: Josef Moravec --- installer/data/mysql/atomicupdate/bug_15475.sql | 6 ++++++ installer/data/mysql/sysprefs.sql | 1 + .../prog/en/modules/admin/preferences/circulation.pref | 8 +++++--- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_15475.sql diff --git a/installer/data/mysql/atomicupdate/bug_15475.sql b/installer/data/mysql/atomicupdate/bug_15475.sql new file mode 100644 index 0000000..9c34eef --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_15475.sql @@ -0,0 +1,6 @@ +INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) + SELECT 'ExportCircHistory', COUNT(*), NULL, "Display the export circulation options", 'YesNo' + FROM systempreferences + WHERE ( variable = 'ExportRemoveFields' AND value != "" AND value IS NOT NULL ) + OR ( variable = 'ExportWithCsvProfile' AND value != "" AND value IS NOT NULL ); +DELETE FROM systempreferences WHERE variable="ExportWithCsvProfile"; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 3d7a8a5..51f854c 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -152,6 +152,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ExpireReservesMaxPickUpDelay','0','','Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay','YesNo'), ('ExpireReservesMaxPickUpDelayCharge','0',NULL,'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.','free'), ('ExpireReservesOnHolidays', '1', NULL, 'If false, reserves at a library will not be canceled on days the library is not open.', 'YesNo'), +('ExportCircHistory', 0, NULL, "Display the export circulation options", 'YesNo' ), ('ExtendedPatronAttributes','0',NULL,'Use extended patron IDs and attributes','YesNo'), ('FacetLabelTruncationLength','20',NULL,'Specify the facet max length in OPAC','Integer'), ('FacetMaxCount','20',NULL,'Specify the max facet count for each category','Integer'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index e69e37f..8647bb7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -117,9 +117,11 @@ Circulation: no: "Do not" - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count). - - - Use the - - pref: ExportWithCsvProfile - - CSV profile when exporting patron checkout history (enter CSV Profile name) + - pref: ExportCircHistory + choices: + yes: Show + no: "Don't show" + - the export patron checkout history options. - - The following fields should be excluded from the patron checkout history CSV or iso2709 export - pref: ExportRemoveFields -- 2.1.4