From e90086fe78dcf6d2aad590f30cb81f255f4104d7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 6 Jun 2019 17:27:42 +0100 Subject: [PATCH] Revert "Bug 22867: (QA follow-up) Build items.json for UniqueItemFields" This reverts commit b97acab4d368ccbced7d99b21fdf371f8c51f1ba which should have really been attached to bug 22844 and the dependancies reversed. Signed-off-by: Martin Renvoize --- .../admin/preferences/acquisitions.pref | 3 +- .../en/modules/admin/preferences/items.json | 47 ------------------- .../en/modules/admin/preferences/patrons.pref | 5 +- 3 files changed, 3 insertions(+), 52 deletions(-) delete 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 9d9fe823a2..c6d8d8d55c 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,8 +11,7 @@ Acquisitions: - - "The following database columns should be unique in an item:" - pref: UniqueItemFields - type: modalselect - source: items + - (separate columns with |) - - 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 deleted file mode 100644 index af89c0fafe..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/items.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "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 18867b4d12..9007da96a4 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 @@ -170,9 +170,8 @@ Patrons: - - "Show the following fields from the items database table as columns on the statistics tab on the patron record: " - pref: StatisticsFields - type: modalselect - source: items - - "If empty, defaults to: location|itype|ccode" + class: multi + - "(separate fields with |, without trailing |). Default if empty: location|itype|ccode" - - pref: EnableBorrowerFiles choices: -- 2.39.5