Attachment 162052 Details for Bug 6796 – Bug 6796: Fix api specifications and embed hours in librarly management

[patch] Bug 6796: Fix api specifications and embed hours in librarly management

Bug-6796-Fix-api-specifications-and-embed-hours-in.patch (text/plain), 2.81 KB, created by Martin Renvoize (ashimema) on 2024-02-12 15:50:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-02-12 15:50:35 UTC

Size: 2.81 KB

patch

obsolete

>From ab40e9eaa67e134d8ed062c5a11ec001804fb5af Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 9 Feb 2024 15:38:34 +0000
>Subject: [PATCH] Bug 6796: Fix api specifications and embed hours in librarly
> management
>
>---
> api/v1/swagger/definitions/library.yaml                   | 2 +-
> api/v1/swagger/paths/libraries.yaml                       | 7 ++-----
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +-
> 3 files changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/api/v1/swagger/definitions/library.yaml b/api/v1/swagger/definitions/library.yaml
>index 789d8b6bdfa..762bea6b163 100644
>--- a/api/v1/swagger/definitions/library.yaml
>+++ b/api/v1/swagger/definitions/library.yaml
>@@ -117,7 +117,7 @@ properties:
>     description: If the library needs an override to act as pickup location for a hold
>   library_hours:
>     type:
>-      - object
>+      - array
>       - "null"
>     description: The open and close times for a library on any given day
> additionalProperties: false
>diff --git a/api/v1/swagger/paths/libraries.yaml b/api/v1/swagger/paths/libraries.yaml
>index ead9798d60b..1c19f2bfccd 100644
>--- a/api/v1/swagger/paths/libraries.yaml
>+++ b/api/v1/swagger/paths/libraries.yaml
>@@ -87,11 +87,6 @@
>         description: Case insensitive 'starts_with' search on notes
>         required: false
>         type: string
>-      - name: library_hours
>-        in: query
>-        description: Case insensitive 'starts_with' search on notes
>-        required: false
>-        type: string
>       - $ref: "../swagger.yaml#/parameters/match"
>       - $ref: "../swagger.yaml#/parameters/order_by"
>       - $ref: "../swagger.yaml#/parameters/page"
>@@ -108,6 +103,7 @@
>           type: string
>           enum:
>             - smtp_server
>+            - library_hours
>         collectionFormat: csv
>     produces:
>       - application/json
>@@ -200,6 +196,7 @@
>           type: string
>           enum:
>             - smtp_server
>+            - library_hours
>         collectionFormat: csv
>     produces:
>       - application/json
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index 64ed6f3200b..1dc5be25ea6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -646,7 +646,7 @@
>                 "ajax": {
>                     "url": libraries_url
>                 },
>-                'embed': [ 'smtp_server' ],
>+                'embed': [ 'smtp_server', 'library_hours' ],
>                 'emptyTable': '<div class="dialog message">'+_("There are no libraries defined.")+' <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">'+_("Start defining libraries")+'</a>.</div>',
>                 "stateSave": true,
>                 "columnDefs": [ {
>-- 
>2.43.0

Actions: View | Diff | Splinter Review

Attachments on bug 6796: 124669 | 124670 | 124671 | 124672 | 134323 | 134324 | 134325 | 134326 | 134327 | 145669 | 145670 | 145671 | 145672 | 145673 | 146988 | 146989 | 146990 | 146991 | 146992 | 150442 | 150443 | 150444 | 150445 | 150446 | 150447 | 150448 | 150477 | 150478 | 153252 | 153253 | 153254 | 153255 | 153256 | 153257 | 153258 | 153259 | 153260 | 153261 | 153271 | 153272 | 153273 | 153274 | 153275 | 153276 | 153277 | 153278 | 153279 | 153280 | 156772 | 156773 | 156774 | 156775 | 156776 | 156777 | 156778 | 156779 | 156780 | 161970 | 161971 | 161972 | 161973 | 161974 | 161975 | 161976 | 161977 | 161978 | 161979 | 161980 | 161986 | 161987 | 161988 | 161989 | 162043 | 162044 | 162045 | 162046 | 162047 | 162048 | 162049 | 162050 | 162051 | 162052 | 162053 | 162054 | 162055 | 162056 | 162090 | 162091 | 162092 | 162093 | 162094 | 162095 | 162096 | 162097 | 162098 | 162099 | 162100 | 162101 | 162102 | 162103 | 162104 | 164511 | 164512 | 164513 | 164514 | 164515 | 164516 | 164517 | 164518 | 164538 | 164539 | 164540 | 164541 | 164542 | 164543 | 164544 | 164545 | 164546 | 164547 | 164548 | 164549 | 164550 | 164551 | 164552