From 6ccd29e095ac8969d9fcc4d0eb81de133ef74f46 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 10 May 2019 08:49:26 +0000 Subject: [PATCH] Bug 22844: (QA follow-up) Build items.json for UniqueItemFields Adding items.json, built from latest kohastructure.sql. Control UniqueItemFields with this source file. And add StatisticsFields. Test plan: Go to Preferences, play with UniqueItemFields. Adjust StatisticsFields and look at patron record, statistics tab. Moved-from: Bug 22867 Signed-off-by: Marcel de Rooy Signed-off-by: David Nind Signed-off-by: Kyle M Hall Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Katrin Fischer --- .../en/modules/admin/preferences/acquisitions.pref | 3 +- .../prog/en/modules/admin/preferences/items.json | 47 ++++++++++++++++++++++ .../prog/en/modules/admin/preferences/patrons.pref | 5 ++- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/items.json diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index c6d8d8d55c..9d9fe823a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -11,7 +11,8 @@ Acquisitions: - - "The following database columns should be unique in an item:" - pref: UniqueItemFields - - (separate columns with |) + type: modalselect + source: items - - When closing or reopening a basket, - pref: BasketConfirmations diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/items.json b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/items.json new file mode 100644 index 0000000000..af89c0fafe --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/items.json @@ -0,0 +1,47 @@ +{ + "itemnumber": "itemnumber", + "biblionumber": "biblionumber", + "biblioitemnumber": "biblioitemnumber", + "barcode": "barcode", + "dateaccessioned": "dateaccessioned", + "booksellerid": "booksellerid", + "homebranch": "homebranch", + "price": "price", + "replacementprice": "replacementprice", + "replacementpricedate": "replacementpricedate", + "datelastborrowed": "datelastborrowed", + "datelastseen": "datelastseen", + "stack": "stack", + "notforloan": "notforloan", + "damaged": "damaged", + "damaged_on": "damaged_on", + "itemlost": "itemlost", + "itemlost_on": "itemlost_on", + "withdrawn": "withdrawn", + "withdrawn_on": "withdrawn_on", + "itemcallnumber": "itemcallnumber", + "coded_location_qualifier": "coded_location_qualifier", + "issues": "issues", + "renewals": "renewals", + "reserves": "reserves", + "restricted": "restricted", + "itemnotes": "itemnotes", + "itemnotes_nonpublic": "itemnotes_nonpublic", + "holdingbranch": "holdingbranch", + "paidfor": "paidfor", + "timestamp": "timestamp", + "location": "location", + "permanent_location": "permanent_location", + "onloan": "onloan", + "cn_source": "cn_source", + "cn_sort": "cn_sort", + "ccode": "ccode", + "materials": "materials", + "uri": "uri", + "itype": "itype", + "more_subfields_xml": "more_subfields_xml", + "enumchron": "enumchron", + "copynumber": "copynumber", + "stocknumber": "stocknumber", + "new_status": "new_status" +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index e9ff487c1b..45cd55203d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -45,8 +45,9 @@ Patrons: - - "Show the following fields from the items database table as columns on the statistics tab on the patron record: " - pref: StatisticsFields - class: multi - - "(separate fields with |, without trailing |). Default if empty: location|itype|ccode" + type: modalselect + source: items + - "If empty, defaults to: location|itype|ccode" - - pref: EnableBorrowerFiles choices: -- 2.11.0