Bugzilla – Attachment 101476 Details for
Bug 23463
Move C4::Items CRUD subroutines to Koha::Item
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23463: (follow-up 3) Fix timestamp default value
Bug-23463-follow-up-3-Fix-timestamp-default-value.patch (text/plain), 2.58 KB, created by
Jonathan Druart
on 2020-03-23 16:24:04 UTC
(
hide
)
Description:
Bug 23463: (follow-up 3) Fix timestamp default value
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-03-23 16:24:04 UTC
Size:
2.58 KB
patch
obsolete
>From f376258cb552fd95cf3710dfa4cd813a1105013f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 23 Mar 2020 17:21:24 +0100 >Subject: [PATCH] Bug 23463: (follow-up 3) Fix timestamp default value > >This is the only situation I found where: > * t/db_dependent/Koha/Item.t is passing > * t/db_dependent/Koha/Object.t is passing > * MySQL 8 is happy (and not fail with "Column 'timestamp' cannot be null"), which is certainly what I missed in the previous follow-up > >I think we should remove the lines from the overloaded ->store method >(Item and Patron), but then we need Object.t to be adjusted. >I do not understand why we would need to set updated_on, maybe the test >is wrong? >--- > Koha/Item.pm | 4 ++-- > Koha/Object.pm | 2 +- > Koha/Patron.pm | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) > >diff --git a/Koha/Item.pm b/Koha/Item.pm >index 67a2328415..aafd75a8f2 100644 >--- a/Koha/Item.pm >+++ b/Koha/Item.pm >@@ -76,6 +76,8 @@ sub store { > $self->itype($self->biblio->biblioitem->itemtype); > } > >+ $self->timestamp(undef) if $self->timestamp; # Maybe move this to Koha::Object->store? >+ > my $today = dt_from_string; > unless ( $self->in_storage ) { #AddItem > unless ( $self->permanent_location ) { >@@ -156,8 +158,6 @@ sub store { > $self->permanent_location( $self->location ); > } > >- $self->timestamp(undef) if $self->timestamp; # Maybe move this to Koha::Object->store? >- > C4::Biblio::ModZebra( $self->biblionumber, "specialUpdate", "biblioserver" ); > > $self->_after_item_action_hooks({ action => 'modify' }); >diff --git a/Koha/Object.pm b/Koha/Object.pm >index 6029217e0f..e56f4b18f4 100644 >--- a/Koha/Object.pm >+++ b/Koha/Object.pm >@@ -155,7 +155,7 @@ sub store { > && $columns_info->{$col}->{datetime_undef_if_invalid} ) > { > # timestamp >- # $self->_result()->set_column($col => $columns_info->{$col}->{default_value}); >+ $self->_result()->set_column($col => $columns_info->{$col}->{default_value}); > } > } > } >diff --git a/Koha/Patron.pm b/Koha/Patron.pm >index 4cd9099d6a..57c3816012 100644 >--- a/Koha/Patron.pm >+++ b/Koha/Patron.pm >@@ -187,6 +187,8 @@ sub store { > $self->fixup_cardnumber; > } > >+ $self->updated_on(undef) if $self->updated_on; # Maybe move this to Koha::Object->store? >+ > unless( $self->category->in_storage ) { > Koha::Exceptions::Object::FKConstraint->throw( > broken_fk => 'categorycode', >-- >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 23463
:
95899
|
95900
|
95901
|
95902
|
95903
|
95904
|
95905
|
95906
|
95907
|
95908
|
95909
|
95910
|
95911
|
95912
|
95913
|
95914
|
95915
|
95916
|
95917
|
95918
|
95919
|
95920
|
95921
|
95922
|
95923
|
95925
|
96145
|
97895
|
97896
|
97897
|
97898
|
97899
|
97900
|
97901
|
97902
|
97903
|
97904
|
97905
|
97906
|
97907
|
97908
|
97909
|
97910
|
97911
|
97912
|
97913
|
97914
|
97915
|
97916
|
97917
|
97918
|
97919
|
97920
|
97921
|
101151
|
101152
|
101153
|
101154
|
101156
|
101157
|
101158
|
101161
|
101163
|
101165
|
101167
|
101169
|
101170
|
101171
|
101172
|
101173
|
101174
|
101175
|
101176
|
101177
|
101178
|
101179
|
101180
|
101181
|
101182
|
101183
|
101184
|
101185
|
101186
|
101188
|
101189
|
101190
|
101191
|
101192
|
101193
|
101194
|
101195
|
101196
|
101197
|
101246
|
101247
|
101248
|
101249
|
101250
|
101251
|
101252
|
101253
|
101254
|
101255
|
101256
|
101257
|
101258
|
101259
|
101260
|
101261
|
101262
|
101263
|
101264
|
101265
|
101266
|
101267
|
101268
|
101269
|
101270
|
101271
|
101272
|
101273
|
101274
|
101275
|
101276
|
101277
|
101278
|
101279
|
101280
|
101281
|
101282
|
101283
|
101284
|
101413
|
101414
|
101415
|
101416
|
101432
|
101476
|
102071
|
103129
|
113581