From 8297471b3b41e00d19134453ba5721ad3f85877b Mon Sep 17 00:00:00 2001 From: PerplexedTheta Date: Mon, 12 Aug 2024 15:26:13 +0100 Subject: [PATCH] Bug 37593: Removed all instances of 'this this' in the codebase To test: a) do a grep for 'this this' 1) notice that there are five matching files 2) notice that all of these instances are in comments, or podfiles b) apply this patch c) do a grep for 'this this' 1) notice now that these instances are gone d) apply these changes to schema.koha-community.org e) result! Signed-off-by: Katrin Fischer (cherry picked from commit 2cc520cdeb6782f9370356f1c7a1bb7f78ea1057) Signed-off-by: Lucas Gass --- Koha/Schema/Result/Deleteditem.pm | 2 +- Koha/Schema/Result/Item.pm | 2 +- installer/data/mysql/db_revs/230600061.pl | 4 ++-- installer/data/mysql/kohastructure.sql | 4 ++-- koha-tmpl/intranet-tmpl/lib/datatables/datatables.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Koha/Schema/Result/Deleteditem.pm b/Koha/Schema/Result/Deleteditem.pm index 118b225121..49a47984c8 100644 --- a/Koha/Schema/Result/Deleteditem.pm +++ b/Koha/Schema/Result/Deleteditem.pm @@ -61,7 +61,7 @@ item barcode (MARC21 952$p) default_value: 0 is_nullable: 0 -boolean value defining whether this this item is available for bookings or not +boolean value defining whether this item is available for bookings or not =head2 dateaccessioned diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm index dcbd2275a8..1b3612b8ee 100644 --- a/Koha/Schema/Result/Item.pm +++ b/Koha/Schema/Result/Item.pm @@ -63,7 +63,7 @@ item barcode (MARC21 952$p) default_value: 0 is_nullable: 0 -boolean value defining whether this this item is available for bookings or not +boolean value defining whether this item is available for bookings or not =head2 dateaccessioned diff --git a/installer/data/mysql/db_revs/230600061.pl b/installer/data/mysql/db_revs/230600061.pl index a9bf4e4596..cb1a47cdbf 100755 --- a/installer/data/mysql/db_revs/230600061.pl +++ b/installer/data/mysql/db_revs/230600061.pl @@ -80,7 +80,7 @@ return { if ( !column_exists( 'items', 'bookable' ) ) { $dbh->do( q{ - ALTER TABLE items ADD COLUMN `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this this item is available for bookings or not' AFTER `barcode` + ALTER TABLE items ADD COLUMN `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this item is available for bookings or not' AFTER `barcode` } ); @@ -90,7 +90,7 @@ return { if ( !column_exists( 'deleteditems', 'bookable' ) ) { $dbh->do( q{ - ALTER TABLE deleteditems ADD COLUMN `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this this item is available for bookings or not' AFTER `barcode` + ALTER TABLE deleteditems ADD COLUMN `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this item is available for bookings or not' AFTER `barcode` } ); diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 4d1f1c10ef..71ec8ff31c 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2750,7 +2750,7 @@ CREATE TABLE `deleteditems` ( `biblionumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from biblio table used to link this item to the right bib record', `biblioitemnumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from the biblioitems table to link to item to additional information', `barcode` varchar(20) DEFAULT NULL COMMENT 'item barcode (MARC21 952$p)', - `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this this item is available for bookings or not', + `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this item is available for bookings or not', `dateaccessioned` date DEFAULT NULL COMMENT 'date the item was acquired or added to Koha (MARC21 952$d)', `booksellerid` longtext DEFAULT NULL COMMENT 'where the item was purchased (MARC21 952$e)', `homebranch` varchar(10) DEFAULT NULL COMMENT 'foreign key from the branches table for the library that owns this item (MARC21 952$a)', @@ -4008,7 +4008,7 @@ CREATE TABLE `items` ( `biblionumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from biblio table used to link this item to the right bib record', `biblioitemnumber` int(11) NOT NULL DEFAULT 0 COMMENT 'foreign key from the biblioitems table to link to item to additional information', `barcode` varchar(20) DEFAULT NULL COMMENT 'item barcode (MARC21 952$p)', - `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this this item is available for bookings or not', + `bookable` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'boolean value defining whether this item is available for bookings or not', `dateaccessioned` date DEFAULT NULL COMMENT 'date the item was acquired or added to Koha (MARC21 952$d)', `booksellerid` longtext DEFAULT NULL COMMENT 'where the item was purchased (MARC21 952$e)', `homebranch` varchar(10) DEFAULT NULL COMMENT 'foreign key from the branches table for the library that owns this item (MARC21 952$a)', diff --git a/koha-tmpl/intranet-tmpl/lib/datatables/datatables.js b/koha-tmpl/intranet-tmpl/lib/datatables/datatables.js index a8ecb4bde3..d5de7e72f7 100644 --- a/koha-tmpl/intranet-tmpl/lib/datatables/datatables.js +++ b/koha-tmpl/intranet-tmpl/lib/datatables/datatables.js @@ -100635,7 +100635,7 @@ this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = { // on destroy, while the `dt` namespaced event is the one we are // listening for $(settings.nTable).on( 'order.dt.DT', function ( e, ctx, sorting, columns ) { - if ( settings !== ctx ) { // need to check this this is the host + if ( settings !== ctx ) { // need to check this is the host return; // table, not a nested one } -- 2.39.5