From 3a4129e6a3ddac568949e32b0f5d699a8dc607fc Mon Sep 17 00:00:00 2001 From: "Nicole C. Engard" Date: Fri, 12 Oct 2012 16:55:54 -0400 Subject: [PATCH 1/2] Bug 7986 Follow Up: Update ExportWithCsvProfile The ExportWithCsvProfile preference was on its own file (tools.pref) when in reality it belonged on the circulation tab. This patch removes the tools.pref file and moves the ExportWithCsvProfile preference and updates the text around it to make it clearer. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc | 1 - .../prog/en/modules/admin/preferences/circulation.pref | 4 ++++ .../prog/en/modules/admin/preferences/tools.pref | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc index af23ab71b3..3ecaefcde7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc @@ -15,7 +15,6 @@ [% IF ( searching ) %]
  • [% ELSE %]
  • [% END %]Searching
    • [% IF ( serials ) %]
  • [% ELSE %]
  • [% END %]Serials
    • [% IF ( staff_client ) %]
  • [% ELSE %]
  • [% END %]Staff client
    • -[% IF ( tools ) %]
  • [% ELSE %]
  • [% END %]Tools
    • [% IF ( web_services ) %]
  • [% ELSE %]
  • [% END %]Web services
    • 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 e953d390a3..4c30cd7d9a 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 @@ -110,6 +110,10 @@ Circulation: yes: Do 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: ExportRemoveFields - choices: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref deleted file mode 100644 index 2891b0efc9..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref +++ /dev/null @@ -1,4 +0,0 @@ -Tools: - - - - pref: ExportWithCsvProfile - - CSV profile for export From f03712d37bc5f05aec60bd045429de9b869171fb Mon Sep 17 00:00:00 2001 From: "Nicole C. Engard" Date: Sat, 13 Oct 2012 02:48:01 -0400 Subject: [PATCH 2/2] Bug 7986 Follow Up: Fix ExportRemoveFields This preference was in the code as a choice but should be a list of fields to exclude. This patch makes that change and updates the description to fit more with the standard set by other preferences. Signed-off-by: Jonathan Druart Signed-off-by: Paul Poulain --- .../prog/en/modules/admin/preferences/circulation.pref | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 4c30cd7d9a..07728f7cdd 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 @@ -115,11 +115,10 @@ Circulation: - pref: ExportWithCsvProfile - CSV profile when exporting patron checkout history (enter CSV Profile name) - + - The following fields should be excluded from the patron checkout history CSV or iso2709 export - pref: ExportRemoveFields - - choices: - yes: Export - no: "Don't export" - - fields for csv or iso2709 export + - (separate fields with space, e.g. 100a 200b 300c) + Checkout Policy: - - pref: AllowNotForLoanOverride