Attachment 174194 Details for Bug 38010 – Bug 38010: Rebase for bug 38390

[patch] Bug 38010: Rebase for bug 38390

Bug-38010-Rebase-for-bug-38390.patch (text/plain), 4.82 KB, created by Matt Blenkinsop on 2024-11-07 13:26:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2024-11-07 13:26:33 UTC

Size: 4.82 KB

patch

obsolete

>From d6c8261507c25e7d99620bb40a2656dc02e55608 Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>Date: Thu, 7 Nov 2024 13:24:00 +0000
>Subject: [PATCH] Bug 38010: Rebase for bug 38390
>
>---
> api/v1/swagger/paths/acquisitions_vendors.yaml | 2 +-
> .../prog/js/vue/components/Vendors/VendorList.vue | 10 +++++-----
> .../js/vue/components/Vendors/VendorSubscriptions.vue | 4 ++--
> .../prog/js/vue/fetch/acquisition-api-client.js | 2 +-
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/api/v1/swagger/paths/acquisitions_vendors.yaml b/api/v1/swagger/paths/acquisitions_vendors.yaml
>index cebe964ac5f..87ec425767d 100644
>--- a/api/v1/swagger/paths/acquisitions_vendors.yaml
>+++ b/api/v1/swagger/paths/acquisitions_vendors.yaml
>@@ -147,7 +147,7 @@
> enum:
> - aliases
> - baskets
>- - subscriptions
>+ - subscriptions+count
> - interfaces
> - contacts
> - contracts
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue
>index e28ba15b53e..318fd1fd03e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue
>@@ -62,7 +62,7 @@ export default {
> searchTerm: null,
> tableOptions: {
> columns: this.getTableColumns(),
>- options: { embed: "aliases,baskets,subscriptions" },
>+ options: { embed: "aliases,baskets,subscriptions+count" },
> url: () => this.tableURL(),
> add_filters: true,
> filters_options: {
>@@ -85,8 +85,8 @@ export default {
> should_display: row =>
> (!row.baskets ||
> row.baskets.length === 0) &&
>- (!row.subscriptions ||
>- row.subscriptions.length === 0),
>+ (!row.subscriptions_count ||
>+ row.subscriptions_count === 0),
> },
> },
> ],
>@@ -234,13 +234,13 @@ export default {
> searchable: false,
> orderable: false,
> render(data, type, row, meta) {
>- return row.subscriptions.length
>+ return row.subscriptions_count
> ? '<a href="/cgi-bin/koha/serials/serials-search.pl?bookseller_filter=' +
> row.name +
> "&searched=1" +
> '" class="show">' +
> escape_str(
>- `${row.subscriptions.length} subscription(s)`
>+ `${row.subscriptions_count} subscription(s)`
> ) +
> "</a>"
> : escape_str(__("No subscriptions"))
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue
>index 419f5adeda3..50536d22a28 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue
>@@ -8,9 +8,9 @@
> <a
> v-if="isUserPermitted('CAN_user_serials')"
> :href="`/cgi-bin/koha/serials/serials-search.pl?bookseller_filter=${vendor.name}&searched=1`"
>- >{{ vendor.subscriptions.length }}</a
>+ >{{ vendor.subscriptions_count }}</a
> >
>- {{ vendor.subscriptions.length }}
>+ {{ vendor.subscriptions_count }}
> 
> </fieldset>
> </template>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/acquisition-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/acquisition-api-client.js
>index 930ec22320f..7e3e59b4e58 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/acquisition-api-client.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/acquisition-api-client.js
>@@ -14,7 +14,7 @@ export class AcquisitionAPIClient extends HttpClient {
> endpoint: "vendors/" + id,
> headers: {
> "x-koha-embed":
>- "aliases,subscriptions,interfaces,contacts,contracts",
>+ "aliases,subscriptions+count,interfaces,contacts,contracts",
> },
> }),
> getAll: (query, params) =>
>-- 
>2.39.3 (Apple Git-146)

Actions: View | Diff | Splinter Review

Attachments on bug 38010: 174119 | 174120 | 174121 | 174122 | 174123 | 174124 | 174125 | 174126 | 174128 | 174129 | 174130 | 174131 | 174132 | 174133 | 174134 | 174135 | 174136 | 174137 | 174138 | 174139 | 174140 | 174141 | 174142 | 174143 | 174144 | 174145 | 174146 | 174147 | 174148 | 174151 | 174152 | 174153 | 174154 | 174155 | 174156 | 174157 | 174158 | 174159 | 174160 | 174161 | 174162 | 174163 | 174164 | 174165 | 174166 | 174167 | 174168 | 174169 | 174170 | 174171 | 174172 | 174173 | 174174 | 174175 | 174176 | 174177 | 174178 | 174179 | 174194 | 174196 | 174197 | 174198 | 174199 | 174200 | 174201 | 174202 | 174203 | 174204 | 174205 | 174206 | 174207 | 174208 | 174209 | 174210 | 174211 | 174212 | 174213 | 174214 | 174215 | 174216 | 174217 | 174218 | 174220 | 174221 | 174222 | 174223 | 174224 | 174225 | 174226 | 174248 | 174266 | 174267 | 174269 | 174270 | 174273 | 174327 | 174328 | 174329 | 174330 | 174331 | 174332 | 174333 | 174334 | 174335 | 174336 | 174337 | 174338 | 174339 | 174340 | 174341 | 174342 | 174343 | 174344 | 174345 | 174346 | 174347 | 174348 | 174349 | 174350 | 174351 | 174352 | 174353 | 174354 | 174355 | 174356 | 174357 | 174358 | 174359 | 174360 | 174603