Bugzilla – Attachment 139375 Details for
Bug 29144
Move branches.opac_info to AdditionalContents allowing multi language
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29144: Copy and remove branches.opac_info (dbrev)
Bug-29144-Copy-and-remove-branchesopacinfo-dbrev.patch (text/plain), 3.93 KB, created by
Martin Renvoize (ashimema)
on 2022-08-18 12:54:56 UTC
(
hide
)
Description:
Bug 29144: Copy and remove branches.opac_info (dbrev)
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-18 12:54:56 UTC
Size:
3.93 KB
patch
obsolete
>From 9a670beba18863dd3bad8f44c5a035d5a1a56edf Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 4 Aug 2022 09:33:13 +0000 >Subject: [PATCH] Bug 29144: Copy and remove branches.opac_info (dbrev) > >Test plan: >Run dbrev. >Check api URL: /api/v1/public/libraries (with/without suffix /[branch_code]. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > api/v1/swagger/definitions/library.yaml | 5 ----- > api/v1/swagger/paths/libraries.yaml | 5 ----- > .../data/mysql/atomicupdate/bug_29144.pl | 19 +++++++++++++++++++ > installer/data/mysql/kohastructure.sql | 1 - > 4 files changed, 19 insertions(+), 11 deletions(-) > create mode 100755 installer/data/mysql/atomicupdate/bug_29144.pl > >diff --git a/api/v1/swagger/definitions/library.yaml b/api/v1/swagger/definitions/library.yaml >index c3a4daaff0..de010c50d3 100644 >--- a/api/v1/swagger/definitions/library.yaml >+++ b/api/v1/swagger/definitions/library.yaml >@@ -89,11 +89,6 @@ properties: > - string > - "null" > description: notes related to your library or branch >- opac_info: >- type: >- - string >- - "null" >- description: HTML that displays in OPAC > geolocation: > type: > - string >diff --git a/api/v1/swagger/paths/libraries.yaml b/api/v1/swagger/paths/libraries.yaml >index b2bd863439..045f884a6d 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: opac_info >- in: query >- description: Case insensitive 'starts-with' search on OPAC info >- required: false >- type: string > - $ref: "../swagger.yaml#/parameters/match" > - $ref: "../swagger.yaml#/parameters/order_by" > - $ref: "../swagger.yaml#/parameters/page" >diff --git a/installer/data/mysql/atomicupdate/bug_29144.pl b/installer/data/mysql/atomicupdate/bug_29144.pl >new file mode 100755 >index 0000000000..8d9ff107ba >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_29144.pl >@@ -0,0 +1,19 @@ >+use Modern::Perl; >+ >+return { >+ bug_number => 29144, >+ description => "Copy and remove branches.opac_info", >+ up => sub { >+ my ($args) = @_; >+ my ($dbh, $out) = @$args{qw(dbh out)}; >+ $dbh->do(q{ >+INSERT IGNORE INTO additional_contents ( category,code,location,branchcode,title,content,lang,published_on ) >+SELECT 'html_customizations', CONCAT('OpacLibraryInfo_', branches.branchcode), 'OpacLibraryInfo', branches.branchcode, branches.branchname, branches.opac_info, 'default', NOW() >+FROM branches >+WHERE branches.opac_info IS NOT NULL >+ }); >+ $dbh->do(q{ >+ALTER TABLE branches DROP COLUMN opac_info; >+ }); >+ }, >+}; >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 3f524aec6a..257d5d4e4c 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -1529,7 +1529,6 @@ CREATE TABLE `branches` ( > `issuing` tinyint(4) DEFAULT NULL COMMENT 'unused in Koha', > `branchip` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the IP address for your library or branch', > `branchnotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'notes related to your library or branch', >- `opac_info` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'HTML that displays in OPAC', > `geolocation` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'geolocation of your library', > `marcorgcode` varchar(16) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'MARC Organization Code, see http://www.loc.gov/marc/organizations/orgshome.html, when empty defaults to syspref MARCOrgCode', > `pickup_location` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'the ability to act as a pickup location', >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29144
:
138473
|
138474
|
138527
|
138528
|
138599
|
138600
|
138601
|
138602
|
138603
|
138604
|
138605
|
138606
|
138607
|
138608
|
138609
|
139182
|
139183
|
139184
|
139185
|
139186
|
139187
|
139188
|
139189
|
139190
|
139191
|
139192
|
139197
|
139198
|
139199
|
139200
|
139201
|
139202
|
139203
|
139204
|
139205
|
139206
|
139207
|
139208
|
139366
|
139367
|
139368
|
139369
|
139370
|
139371
|
139372
|
139373
|
139374
|
139375
|
139376
|
139377
|
140020
|
140021
|
140022
|
140023
|
140024
|
140025
|
140026
|
140027
|
140028
|
140029
|
140030
|
140707