From fcd90c5e46b94d5c744f2b26574cc8b4554d6821 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 19 Apr 2022 14:44:24 +0100 Subject: [PATCH] Bug 28633: (follow-up) Account for bug 29695 changes During rebase of this patchset we drop the columns.def and borrowers.json changes introduced. We store this mapping in the module now, so this patch does that. --- Koha/Database/Columns.pm | 1 + .../modules/admin/preferences/borrowers.json | 60 ------------------- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json diff --git a/Koha/Database/Columns.pm b/Koha/Database/Columns.pm index 5fa7075de2..a050df071f 100644 --- a/Koha/Database/Columns.pm +++ b/Koha/Database/Columns.pm @@ -63,6 +63,7 @@ sub columns { "title" => __("Salutation"), "surname" => __("Surname"), "firstname" => __("First name"), + "preferred_name" => __("Preferred name"), "dateofbirth" => __("Date of birth"), "initials" => __("Initials"), "othernames" => __("Other name"), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json deleted file mode 100644 index 64336e1d6c..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "cardnumber": "cardnumber", - "surname": "surname", - "firstname": "firstname", - "preferred_name": "preferred_name", - "title": "title", - "othernames": "othernames", - "initials": "initials", - "streetnumber": "streetnumber", - "streettype": "streettype", - "address": "address", - "address2": "address2", - "city": "city", - "state": "state", - "zipcode": "zipcode", - "country": "country", - "email": "email", - "phone": "phone", - "mobile": "mobile", - "fax": "fax", - "emailpro": "emailpro", - "phonepro": "phonepro", - "B_streetnumber": "B_streetnumber", - "B_streettype": "B_streettype", - "B_address": "B_address", - "B_address2": "B_address2", - "B_city": "B_city", - "B_state": "B_state", - "B_zipcode": "B_zipcode", - "B_country": "B_country", - "B_email": "B_email", - "B_phone": "B_phone", - "dateofbirth": "dateofbirth", - "dateenrolled": "dateenrolled", - "dateexpiry": "dateexpiry", - "branchcode": "branchcode", - "categorycode": "categorycode", - "contactname": "contactname", - "contactfirstname": "contactfirstname", - "borrowernotes": "borrowernotes", - "sex": "sex", - "password": "password", - "userid": "userid", - "opacnote": "opacnote", - "contactnote": "contactnote", - "altcontactfirstname": "altcontactfirstname", - "altcontactsurname": "altcontactsurname", - "altcontactaddress1": "altcontactaddress1", - "altcontactaddress2": "altcontactaddress2", - "altcontactaddress3": "altcontactaddress3", - "altcontactstate": "altcontactstate", - "altcontactzipcode": "altcontactzipcode", - "altcontactcountry": "altcontactcountry", - "altcontactphone": "altcontactphone", - "smsalertnumber": "smsalertnumber", - "autorenew_checkouts": "autorenew_checkouts", - "primary_contact_method": "primary_contact_method", - "sort1": "sort1", - "sort2": "sort2" -} -- 2.30.2