From 810ff07321999202eadde3d5b50d1ddf9104ffd0 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Wed, 22 Jul 2026 16:10:25 +0100 Subject: [PATCH] Bug 43121: Convert all groups to use explicit labels Test plan: 1) Install another language 2) Navigate to a vendor record 3) The group names should translate correctly and display in the split screen view Signed-off-by: Michaela Signed-off-by: Jonathan Druart Signed-off-by: Lucas Gass --- .../vue/components/ERM/AgreementResource.vue | 17 +++- .../ERM/EHoldingsLocalPackageResource.vue | 5 +- .../ERM/EHoldingsLocalTitleResource.vue | 5 +- .../js/vue/components/ERM/LicenseResource.vue | 8 +- .../ILL/RequestingAgencyResource.vue | 18 ++-- .../vue/components/ILL/SupplyingResource.vue | 42 ++++---- .../components/SIP2/SIP2AccountResource.vue | 96 ++++++++++--------- .../SIP2/SIP2InstitutionResource.vue | 22 +++-- .../vue/components/Vendors/VendorResource.vue | 63 ++++++------ 9 files changed, 161 insertions(+), 115 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue index f54379d940..ebfa35836a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementResource.vue @@ -93,6 +93,13 @@ export default { }, embedded: props.embedded, extendedAttributesResourceType, + groupLabels: { + documents: $__("Documents"), + licenses: $__("Licenses"), + periods: $__("Periods"), + related_agreements: $__("Related agreements"), + users: $__("Users"), + }, resourceAttrs: [ { name: "agreement_id", @@ -192,7 +199,7 @@ export default { }, ], }, - group: $__("Periods"), + group: "periods", componentProps: { resourceRelationships: { resourceProperty: "periods", @@ -268,7 +275,7 @@ export default { { name: "user_roles", type: "relationshipWidget", - group: $__("Users"), + group: "users", showElement: { type: "table", columnData: "user_roles", @@ -349,7 +356,7 @@ export default { { name: "agreement_licenses", type: "relationshipWidget", - group: $__("Licenses"), + group: "licenses", showElement: { type: "table", columnData: "agreement_licenses", @@ -482,7 +489,7 @@ export default { { name: "agreement_relationships", type: "relationshipWidget", - group: $__("Related agreements"), + group: "related_agreements", showElement: { type: "component", hidden: agreement => @@ -583,7 +590,7 @@ export default { { name: "documents", type: "relationshipWidget", - group: $__("Documents"), + group: "documents", showElement: { type: "component", label: $__("Agreement users"), diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue index b4e6dc1c0c..ff95fd2450 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageResource.vue @@ -53,6 +53,9 @@ export default { vendors, props, moduleStore: "ERMStore", + groupLabels: { + agreements: $__("Agreements"), + }, resourceAttrs: [ { name: "name", @@ -120,7 +123,7 @@ export default { { name: "package_agreements", type: "relationshipWidget", - group: $__("Agreements"), + group: "agreements", showElement: { type: "table", columnData: "package_agreements", diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue index 4b72d2282b..2150ca47a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue @@ -69,6 +69,9 @@ export default { additionalToolbarButtons, moduleStore: "ERMStore", extendedAttributesResourceType: "title", + groupLabels: { + packages: $__("Packages"), + }, resourceAttrs: [ { name: "publication_title", @@ -289,7 +292,7 @@ export default { { name: "resources", type: "relationshipWidget", - group: $__("Packages"), + group: "packages", apiClient: APIClient.erm.localPackages, showElement: { type: "component", diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue index 4a1d5654ca..0839c2bf59 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicenseResource.vue @@ -54,6 +54,10 @@ export default { vendors, props, moduleStore: "ERMStore", + groupLabels: { + documents: $__("Documents"), + users: $__("Users"), + }, resourceAttrs: [ { name: "license_id", @@ -129,7 +133,7 @@ export default { { name: "user_roles", type: "relationshipWidget", - group: $__("Users"), + group: "users", showElement: { type: "table", columnData: "user_roles", @@ -211,7 +215,7 @@ export default { { name: "documents", type: "relationshipWidget", - group: $__("Documents"), + group: "documents", showElement: { type: "component", hidden: license => !!license.documents?.length, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/RequestingAgencyResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/RequestingAgencyResource.vue index ed7e269a79..6b30009a25 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/RequestingAgencyResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/RequestingAgencyResource.vue @@ -49,13 +49,17 @@ export default { APIClient.ill.httpClient._baseURL + "iso18626_requesting_agencies", }, + groupLabels: { + details: $__("Details"), + iso18626_authentication: $__("ISO18626 authentication"), + }, resourceAttrs: [ { name: "iso18626_requesting_agency_id", label: $__("ID"), type: "text", hideIn: ["Form"], - group: $__("Details"), + group: "details", }, { name: "patron_id", @@ -69,14 +73,14 @@ export default { }, patronEmbedName: "ill_partner", required: true, - group: $__("Details"), + group: "details", }, { name: "name", label: $__("Name"), required: true, type: "text", - group: $__("Details"), + group: "details", }, { name: "type", @@ -99,14 +103,14 @@ export default { ], requiredKey: "value", selectLabel: "description", - group: $__("Details"), + group: "details", }, { name: "account_id", label: $__("Account ID"), required: true, type: "text", - group: $__("ISO18626 authentication"), + group: "iso18626_authentication", }, { name: "securityCode", @@ -114,7 +118,7 @@ export default { required: true, type: "text", hideIn: ["List"], - group: $__("ISO18626 authentication"), + group: "iso18626_authentication", }, { name: "callback_endpoint", @@ -124,7 +128,7 @@ export default { ), type: "text", hideIn: ["List"], - group: $__("Details"), + group: "details", }, ], moduleStore: "ILLStore", diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/SupplyingResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/SupplyingResource.vue index ba6bfc03d1..a37ae8e3a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/SupplyingResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ILL/SupplyingResource.vue @@ -929,18 +929,26 @@ export default { }, showGroupsDisplayMode: "splitScreen", splitScreenGroupings: [ - { name: $__("Request details"), pane: 1 }, - { name: $__("ISO18626 Messages"), pane: 1 }, - { name: $__("Circulation information"), pane: 2 }, - { name: $__("Specified by the requesting agency"), pane: 2 }, + { name: "request_details", pane: 1 }, + { name: "iso18626_messages", pane: 1 }, + { name: "circulation_information", pane: 2 }, + { name: "specified_by_the_requesting_agency", pane: 2 }, ], + groupLabels: { + request_details: $__("Request details"), + iso18626_messages: $__("ISO18626 Messages"), + circulation_information: $__("Circulation information"), + specified_by_the_requesting_agency: $__( + "Specified by the requesting agency" + ), + }, resourceAttrs: [ { name: "iso18626_request_id", label: $__("Supplying agency request ID"), type: "text", hideIn: ["Form"], - group: $__("Request details"), + group: "request_details", }, { name: "iso18626_requesting_agency_id", @@ -957,28 +965,28 @@ export default { relationshipAPIClient: APIClient.ill.requesting_agencies, relationshipOptionLabelAttr: "name", relationshipRequiredKey: "iso18626_requesting_agency_id", - group: $__("Request details"), + group: "request_details", }, { name: "status", label: $__("Status"), type: "text", hideIn: ["Form"], - group: $__("Request details"), + group: "request_details", }, { name: "service_type", label: $__("Service type"), type: "text", hideIn: ["Form"], - group: $__("Specified by the requesting agency"), + group: "specified_by_the_requesting_agency", }, { name: "pending_requesting_agency_action", label: $__("Requesting agency has requested"), type: "text", hideIn: ["Form", "List"], - group: $__("Specified by the requesting agency"), + group: "specified_by_the_requesting_agency", format: value => (value ? value : $__("N/A")), }, { @@ -986,21 +994,21 @@ export default { label: $__("Created on"), type: "date", hideIn: ["Form"], - group: $__("Request details"), + group: "request_details", }, { name: "updated_on", label: $__("Updated on"), type: "date", hideIn: ["Form"], - group: $__("Request details"), + group: "request_details", }, { name: "requestingAgencyRequestId", label: $__("Requesting agency request ID"), type: "text", hideIn: ["List", "Form"], - group: $__("Request details"), + group: "request_details", }, { name: "biblio_id", @@ -1016,7 +1024,7 @@ export default { }, }, }, - group: $__("Request details"), + group: "request_details", }, { name: "hold_id", @@ -1024,7 +1032,7 @@ export default { type: "text", format: value => (value ? $__("Yes") : $__("No")), hideIn: ["List", "Form"], - group: $__("Circulation information"), + group: "circulation_information", }, { name: "hold", @@ -1032,7 +1040,7 @@ export default { type: "text", hideIn: ["List", "Form"], format: value => (value?.item_id ? $__("Yes") : $__("No")), - group: $__("Circulation information"), + group: "circulation_information", }, { name: "issue_id", @@ -1040,10 +1048,10 @@ export default { type: "text", hideIn: ["List", "Form"], format: value => (value ? $__("Yes") : $__("No")), - group: $__("Circulation information"), + group: "circulation_information", }, { - group: $__("ISO18626 Messages"), + group: "iso18626_messages", name: "messages", label: "", type: "relationshipWidget", diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue index e2ccacf298..457bf595e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2AccountResource.vue @@ -119,7 +119,7 @@ export default { required: true, type: "text", label: __("Staff userid for SIP2 authentication"), - group: "Details", + group: "details", toolTip: __( "Must match the userid of an existing Koha user with appropriate circulation permissions" ), @@ -140,13 +140,13 @@ export default { relationshipAPIClient: APIClient.sip2.institutions, relationshipOptionLabelAttr: "name", relationshipRequiredKey: "sip_institution_id", - group: "Details", + group: "details", }, { name: "allow_additional_materials_checkout", type: "boolean", label: __("Allow additional materials checkout"), - group: "Details", + group: "details", hideIn: ["List"], toolTip: __( "If enabled, allows patrons to check out items via SIP even if the item has additional materials" @@ -156,7 +156,7 @@ export default { name: "allow_empty_passwords", type: "boolean", label: __("Allow empty passwords"), - group: "Details", + group: "details", hideIn: ["List"], }, { @@ -168,7 +168,7 @@ export default { requiredKey: "value", selectLabel: "description", label: __("Allow fields"), - group: "Details", + group: "details", hideIn: ["List"], toolTip: __( "Hides all fields not in the list, it is the inverse of hide_fields ( hide_fields takes precedence )" @@ -184,7 +184,7 @@ export default { relationshipRequiredKey: "item_type_id", label: __("Blocked item types"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "List of item types that are blocked from being issued at this SIP account" ), @@ -194,14 +194,14 @@ export default { type: "boolean", label: __("Checked in OK"), hideIn: ["List"], - group: "Details", + group: "details", }, { name: "convert_nonprinting_characters", type: "text", label: __("Convert nonprinting characters"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Convert control and non-space separator characters into the given string" ), @@ -223,7 +223,7 @@ export default { requiredKey: "value", selectLabel: "description", hideIn: ["List"], - group: "Details", + group: "details", defaultValue: "collection_code", toolTip: __( "CR (Collection Code) is a 3M extension field that communicates an item's shelving category to SIP2 clients. Selects which Koha item field to use as the CR value. Defaults to 'collection_code'." @@ -234,7 +234,7 @@ export default { type: "boolean", label: __("CT always send"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "CT (Destination Location) tells the SIP2 client where to route an item, for example to a holds shelf or to another branch for transfer. When enabled, this field is always sent in checkin responses even when the item has no routing destination." ), @@ -244,7 +244,7 @@ export default { type: "boolean", label: __("CV always send 00 on success"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( 'CV (Alert Type) classifies the reason for a checkin alert, for example: 01 = hold at same branch, 02 = hold for another branch, 04 = item needs transfer. Some SIP2 clients require CV to be present in every checkin response; when enabled, sends CV with value "00" (no alert) on successful checkins instead of omitting the field entirely.' ), @@ -254,7 +254,7 @@ export default { type: "boolean", label: __("CV triggers alert"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "When enabled, the SIP2 alert flag is only raised if a CV (Alert Type) value is present. When disabled (the default), the alert flag is raised if the checkin failed or if any CV value is sent." ), @@ -264,14 +264,14 @@ export default { type: "text", label: __("Delimiter"), placeholder: "|", - group: "Details", + group: "details", }, { name: "disallow_overpayment", type: "boolean", label: __("Disallow overpayment"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Set if over-paying a patron's account via SIP2 should fail, rather than create a credit on the account" ), @@ -287,20 +287,20 @@ export default { defaultValue: null, requiredKey: "value", selectLabel: "description", - group: "Details", + group: "details", }, { name: "error_detect", type: "boolean", label: __("Error detect"), - group: "Details", + group: "details", }, { name: "format_due_date", type: "boolean", label: __("Format due date"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Set to format the due date in the current DateFormat syspref" ), @@ -315,7 +315,7 @@ export default { selectLabel: "description", label: __("Hide fields"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Hides all fields in the list, it is the inverse of allow_fields ( hide_fields takes precedence )" ), @@ -325,14 +325,14 @@ export default { type: "boolean", label: __("Holds block checkin"), hideIn: ["List"], - group: "Details", + group: "details", }, { name: "holds_get_captured", type: "boolean", label: __("Holds get captured"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "If enabled, items are automatically assigned to holds at SIP check-in; The alerts messages will continue to show, however, to allow items to be put to one side and then captured by a subsequent staff check-in." ), @@ -348,7 +348,7 @@ export default { relationshipRequiredKey: "item_type_id", label: __("Inhouse item types"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Item types that can only do in house checkouts via SIP self check machines" ), @@ -363,7 +363,7 @@ export default { relationshipRequiredKey: "patron_category_id", label: __("Inhouse patron categories"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Patron categories that can only do in house checkouts via SIP self check machines" ), @@ -373,7 +373,7 @@ export default { type: "number", label: __("Lost block checkout"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "If a patron has more than a certain number of lost items (default is 1), a flag is set" ), @@ -384,7 +384,7 @@ export default { type: "number", label: __("Lost block checkout value"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Specifies the minimum value of a lost item to be counted towards the lost_block_checkout threshold." ), @@ -397,21 +397,21 @@ export default { avCat: "av_lost", defaultValue: null, hideIn: ["List"], - group: "Details", + group: "details", }, { name: "overdues_block_checkout", type: "boolean", label: __("Overdues block checkout"), hideIn: ["List"], - group: "Details", + group: "details", }, { name: "payment_type_writeoff", type: "text", label: __("Payment type writeoff"), hideIn: ["List"], - group: "Details", + group: "details", placeholder: "06", }, { @@ -419,7 +419,7 @@ export default { type: "boolean", label: __("Block previous checkouts"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Block checkout of items previously or currently checked out by a patron" ), @@ -435,7 +435,7 @@ export default { sysprefs.value.UseCashRegisters !== "0" ? ["List"] : ["Form", "Show", "List"], - group: "Details", + group: "details", toolTip: __( "Only required if system preference UseCashRegisters is enabled" ), @@ -452,7 +452,7 @@ export default { requiredKey: "value", selectLabel: "description", hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "If set, the item information SIP message will update the datelastseen field for items. For lost items, will either keep them as'lost' or mark them as 'found' depending on the setting" ), @@ -462,14 +462,14 @@ export default { type: "boolean", label: __("Send patron home library in AF"), hideIn: ["List"], - group: "Details", + group: "details", }, { name: "patron_branchcode_in_ao", type: "boolean", label: __("Send patron home library in AO"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "Send patron branchcode in AO field for patron status and patron information responses" ), @@ -479,7 +479,7 @@ export default { type: "boolean", label: __("Show checkin message"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "If enabled, successful checking responses will contain an AF screen message" ), @@ -489,7 +489,7 @@ export default { type: "boolean", label: __("Show outstanding amount"), hideIn: ["List"], - group: "Details", + group: "details", toolTip: __( "If enabled, if the patron has outstanding charges, the total outstanding amount is displayed on SIP checkout" ), @@ -506,7 +506,7 @@ export default { selectLabel: "description", label: __("Terminator"), placeholder: "CRLF", - group: "Details", + group: "details", }, { name: "custom_patron_fields", @@ -527,7 +527,7 @@ export default { ], }, hideIn: ["List"], - group: __("SIP response mappings"), + group: "sip_response_mappings", componentProps: { resourceRelationships: { resourceProperty: "custom_patron_fields", @@ -588,7 +588,7 @@ export default { ], }, hideIn: ["List"], - group: __("SIP response mappings"), + group: "sip_response_mappings", componentProps: { resourceRelationships: { resourceProperty: "patron_attributes", @@ -650,7 +650,7 @@ export default { ], }, hideIn: ["List"], - group: __("SIP response mappings"), + group: "sip_response_mappings", componentProps: { resourceRelationships: { resourceProperty: "custom_item_fields", @@ -709,7 +709,7 @@ export default { ], }, hideIn: ["List"], - group: __("SIP response mappings"), + group: "sip_response_mappings", componentProps: { resourceRelationships: { resourceProperty: "item_fields", @@ -764,7 +764,7 @@ export default { ], }, hideIn: ["List"], - group: __("SIP response mappings"), + group: "sip_response_mappings", componentProps: { resourceRelationships: { resourceProperty: "sort_bin_mappings", @@ -814,7 +814,7 @@ export default { ], }, hideIn: ["List"], - group: __("SIP response mappings"), + group: "sip_response_mappings", componentProps: { resourceRelationships: { resourceProperty: "screen_msg_regexs", @@ -873,7 +873,7 @@ export default { ], }, hideIn: ["List"], - group: __("System preference overrides"), + group: "system_preference_overrides", componentProps: { resourceRelationships: { resourceProperty: "system_preference_overrides", @@ -922,7 +922,7 @@ export default { placeholder: "[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]", hideIn: ["List"], - group: "Templates", + group: "templates", toolTip: "AE " + __( @@ -936,7 +936,7 @@ export default { placeholder: "[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]", hideIn: ["List"], - group: "Templates", + group: "templates", toolTip: "AV " + __( @@ -950,7 +950,7 @@ export default { placeholder: "[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]", hideIn: ["List"], - group: "Templates", + group: "templates", toolTip: "DA " + __( @@ -988,6 +988,12 @@ export default { stickyToolbar: ["Form"], embedded: props.embedded, formGroupsDisplayMode: "accordion", + groupLabels: { + details: $__("Details"), + templates: $__("Templates"), + sip_response_mappings: $__("SIP response mappings"), + system_preference_overrides: $__("System preference overrides"), + }, resourceAttrs, props, moduleStore: "SIP2Store", diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue index 57d3d79f13..3d64e9a33d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/SIP2/SIP2InstitutionResource.vue @@ -45,6 +45,10 @@ export default { APIClient.sip2.httpClient._baseURL + "institutions", }, navigationOnFormSave: "SIP2InstitutionsList", + groupLabels: { + details: $__("Details"), + policy: $__("Policy"), + }, resourceAttrs: [ { name: "name", @@ -52,7 +56,7 @@ export default { type: "text", label: __("Name"), showInTable: true, - group: "Details", + group: "details", toolTip: __( "Name of institution, often chosen to match an existing library branch code or library group title. Unexpected behavior may occur if it is not a valid branch code." ), @@ -63,7 +67,7 @@ export default { type: "text", label: __("Implementation"), showInTable: true, - group: "Details", + group: "details", placeholder: "ILS", defaultValue: "ILS", toolTip: __( @@ -75,7 +79,7 @@ export default { type: "boolean", label: __("Checkin"), showInTable: true, - group: "Policy", + group: "policy", toolTip: __( "Are the self service terminals permitted to check items in?" ), @@ -86,7 +90,7 @@ export default { type: "boolean", label: __("Checkout"), showInTable: true, - group: "Policy", + group: "policy", toolTip: __( "Are the self service terminals permitted to check items out to patrons?" ), @@ -97,7 +101,7 @@ export default { type: "boolean", label: __("Offline"), showInTable: true, - group: "Policy", + group: "policy", toolTip: __( "Does the ILS allow self-check units to operate when unconnected to the ILS? That is, can a self-check unit check out items to patrons without checking the status of the items and patrons in real time?" ), @@ -108,7 +112,7 @@ export default { type: "boolean", label: __("Renewal"), showInTable: true, - group: "Policy", + group: "policy", toolTip: __( "Are the self service terminals permitted to renew items?" ), @@ -120,7 +124,7 @@ export default { type: "number", label: __("Retries"), show_in_table: true, - group: "Policy", + group: "policy", showInTable: true, defaultValue: 5, toolTip: __( @@ -134,7 +138,7 @@ export default { type: "boolean", label: __("Status update"), showInTable: true, - group: "Policy", + group: "policy", toolTip: __( "Are the self service terminals permitted to update patron status information. For example, can terminals block patrons?" ), @@ -145,7 +149,7 @@ export default { type: "number", label: __("Timeout"), showInTable: true, - group: "Policy", + group: "policy", defaultValue: 100, toolTip: __( "Time, in seconds, that the system will wait for a response from the ILS before timing out the request." diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue index 61dbccf6c5..1499c24080 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue @@ -146,20 +146,27 @@ export default { formGroupsDisplayMode: "accordion", showGroupsDisplayMode: "splitScreen", splitScreenGroupings: [ - { name: "Details", pane: 1 }, - { name: "Aliases", pane: 1 }, - { name: "Ordering information", pane: 2 }, - { name: "Interfaces", pane: 2 }, + { name: "details", pane: 1 }, + { name: "aliases", pane: 1 }, + { name: "ordering_information", pane: 2 }, + { name: "interfaces", pane: 2 }, ], + groupLabels: { + details: $__("Details"), + aliases: $__("Aliases"), + contacts: $__("Contacts"), + ordering_information: $__("Ordering information"), + interfaces: $__("Interfaces"), + }, additionalToolbarButtons, defaultToolbarButtons, stickyToolbar: ["Form"], extendedAttributesResourceType: "vendor", - extendedAttributesFieldGroup: "Details", + extendedAttributesFieldGroup: "details", resourceAttrs: [ { name: "id", - group: $__("Details"), + group: "details", label: $__("ID"), type: "text", hideIn: ["Form", "Show"], @@ -167,14 +174,14 @@ export default { { name: "name", tableDataSearchFields: "me.name:aliases.alias:me.id", - group: $__("Details"), + group: "details", required: true, type: "text", label: $__("Vendor name"), }, { name: "postal", - group: $__("Details"), + group: "details", type: "textarea", label: $__("Postal address"), textAreaRows: 3, @@ -182,7 +189,7 @@ export default { }, { name: "physical", - group: $__("Details"), + group: "details", type: "textarea", label: $__("Physical address"), textAreaRows: 3, @@ -190,35 +197,35 @@ export default { }, { name: "phone", - group: $__("Details"), + group: "details", type: "text", label: $__("Phone"), hideIn: ["List"], }, { name: "fax", - group: $__("Details"), + group: "details", type: "text", label: $__("Fax"), hideIn: ["List"], }, { name: "url", - group: $__("Details"), + group: "details", type: "text", label: $__("Website"), hideIn: ["List"], }, { name: "accountnumber", - group: $__("Details"), + group: "details", type: "text", label: $__("Account number"), hideIn: ["List"], }, { name: "type", - group: $__("Details"), + group: "details", type: "select", label: $__("Vendor type"), avCat: "av_vendor_types", @@ -227,7 +234,7 @@ export default { { name: "aliases", type: "relationshipWidget", - group: $__("Aliases"), + group: "aliases", showElement: { type: "table", columnData: "aliases", @@ -271,7 +278,7 @@ export default { { name: "contacts", type: "relationshipWidget", - group: $__("Contacts"), + group: "contacts", componentProps: { resourceRelationships: { resourceProperty: "contacts", @@ -364,7 +371,7 @@ export default { { name: "interfaces", type: "relationshipWidget", - group: $__("Interfaces"), + group: "interfaces", showElement: { type: "component", hidden: vendor => !!vendor.interfaces?.length, @@ -451,7 +458,7 @@ export default { }, { name: "active", - group: $__("Ordering information"), + group: "ordering_information", label: $__("Vendor is"), type: "radio", options: [ @@ -462,7 +469,7 @@ export default { }, { name: "list_currency", - group: $__("Ordering information"), + group: "ordering_information", type: "select", label: $__("List prices are"), selectLabel: "currency", @@ -473,7 +480,7 @@ export default { }, { name: "invoice_currency", - group: $__("Ordering information"), + group: "ordering_information", type: "select", selectLabel: "currency", requiredKey: "currency", @@ -483,7 +490,7 @@ export default { }, { name: "gst", - group: $__("Ordering information"), + group: "ordering_information", label: $__("Tax number registered"), type: "radio", options: [ @@ -495,7 +502,7 @@ export default { }, { name: "invoice_includes_gst", - group: $__("Ordering information"), + group: "ordering_information", label: $__("Invoice prices"), type: "radio", options: [ @@ -507,7 +514,7 @@ export default { }, { name: "payment_method", - group: $__("Ordering information"), + group: "ordering_information", type: "select", label: $__("Payment method"), avCat: "av_vendor_payment_methods", @@ -516,7 +523,7 @@ export default { }, { name: "list_includes_gst", - group: $__("Ordering information"), + group: "ordering_information", label: $__("List prices"), type: "radio", options: [ @@ -528,7 +535,7 @@ export default { }, { name: "tax_rate", - group: $__("Ordering information"), + group: "ordering_information", type: "select", label: $__("Tax rate"), options: gstValues.value, @@ -539,7 +546,7 @@ export default { }, { name: "discount", - group: $__("Ordering information"), + group: "ordering_information", type: "number", label: $__("Discount (%)"), defaultValue: null, @@ -552,14 +559,14 @@ export default { }, { name: "deliverytime", - group: $__("Ordering information"), + group: "ordering_information", type: "number", label: $__("Delivery time (days)"), hideIn: ["List"], }, { name: "notes", - group: $__("Ordering information"), + group: "ordering_information", type: "textarea", label: $__("Notes"), hideIn: ["List"],