Bugzilla – Attachment 75910 Details for
Bug 20271
Merge deleted biblio, biblioitems, biblio_metadata, and items tables
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20271: (QA follow-up) Remove last occurrences of deleted_at
Bug-20271-QA-follow-up-Remove-last-occurrences-of-.patch (text/plain), 1.73 KB, created by
Marcel de Rooy
on 2018-06-08 08:37:25 UTC
(
hide
)
Description:
Bug 20271: (QA follow-up) Remove last occurrences of deleted_at
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2018-06-08 08:37:25 UTC
Size:
1.73 KB
patch
obsolete
>From 55a5643b519fc5881acbc851400266d7d94e7ab2 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 8 Jun 2018 10:34:29 +0200 >Subject: [PATCH] Bug 20271: (QA follow-up) Remove last occurrences of > deleted_at >Content-Type: text/plain; charset=utf-8 > >Trivial replace of deleted_at by deleted_on. > >Test plan: >Run t/db_dependent/Koha/ItemTypes.t >Run t/db_dependent/Items_DelItemCheck.t >git grep -E "deleted_at\W" > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > Koha/ItemType.pm | 2 +- > t/db_dependent/Items_DelItemCheck.t | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/Koha/ItemType.pm b/Koha/ItemType.pm >index 4c815fe..01283c7 100644 >--- a/Koha/ItemType.pm >+++ b/Koha/ItemType.pm >@@ -101,7 +101,7 @@ Counts up the number of biblioitems and items with itemtype (code) and hands bac > > sub can_be_deleted { > my ($self) = @_; >- my $nb_items = Koha::Items->search( { itype => $self->itemtype, deleted_at => undef } )->count; >+ my $nb_items = Koha::Items->search( { itype => $self->itemtype, deleted_on => undef } )->count; > my $nb_biblioitems = Koha::Biblioitems->search( { itemtype => $self->itemtype } )->count; > return $nb_items + $nb_biblioitems == 0 ? 1 : 0; > } >diff --git a/t/db_dependent/Items_DelItemCheck.t b/t/db_dependent/Items_DelItemCheck.t >index 0963ebd..66ad433 100644 >--- a/t/db_dependent/Items_DelItemCheck.t >+++ b/t/db_dependent/Items_DelItemCheck.t >@@ -161,7 +161,7 @@ DelItemCheck( $biblio->{biblionumber}, $item->{itemnumber} ); > > my $test_item = GetItem( $item->{itemnumber} ); > >-isnt( $test_item->{deleted_at}, undef, >+isnt( $test_item->{deleted_on}, undef, > "DelItemCheck should delete item if ItemSafeToDelete returns true" > ); > >-- >2.1.4
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 20271
:
72300
|
72799
|
72800
|
73091
|
73092
|
73093
|
73535
|
73536
|
73537
|
73538
|
73539
|
73540
|
73597
|
73759
|
73760
|
73761
|
73762
|
73763
|
73764
|
73765
|
74127
|
74128
|
74129
|
74130
|
74131
|
74132
|
74133
|
74134
|
74135
|
74136
|
74137
|
74138
|
74139
|
74140
|
74141
|
74142
|
74182
|
74183
|
74184
|
74185
|
74186
|
74187
|
74188
|
74189
|
74190
|
74223
|
74407
|
74408
|
74409
|
74410
|
74411
|
74412
|
74413
|
74414
|
74415
|
74416
|
75265
|
75347
|
75894
|
75897
|
75898
|
75899
|
75910
|
75977
|
75978
|
75979
|
75980
|
75981
|
75982
|
75983
|
75984
|
75985
|
75986
|
75987
|
75988
|
75989
|
75990
|
75991
|
75992
|
75993
|
76047
|
76048
|
76255
|
76256
|
76257
|
76258
|
76259
|
76260
|
76261
|
76262
|
76263
|
76264
|
76265
|
76266
|
76267
|
76268
|
76269
|
76270
|
76271
|
76272
|
76273
|
76274
|
76275
|
76276
|
76277
|
76493
|
76494
|
76495
|
76496
|
76497
|
76498
|
76499
|
76500
|
76501
|
76502
|
76503
|
76504
|
76505
|
76506
|
76507
|
76508
|
76509
|
76510
|
76511
|
76512
|
76513
|
76514