Bugzilla – Attachment 120745 Details for
Bug 26995
Drop column relationship from borrower tables
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26995: Remove references to relationship column
Bug-26995-Remove-references-to-relationship-column.patch (text/plain), 5.55 KB, created by
Katrin Fischer
on 2021-05-09 13:42:06 UTC
(
hide
)
Description:
Bug 26995: Remove references to relationship column
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2021-05-09 13:42:06 UTC
Size:
5.55 KB
patch
obsolete
>From e9addcee6fab1ad1459310e76d70a0b919c20912 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 21 Jan 2021 06:59:00 -0500 >Subject: [PATCH] Bug 26995: Remove references to relationship column > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > Koha/Patron.pm | 4 ---- > about.pl | 4 ---- > koha-tmpl/intranet-tmpl/prog/en/columns.def | 1 - > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++-- > t/db_dependent/Koha/Patrons.t | 6 +----- > 5 files changed, 3 insertions(+), 16 deletions(-) > >diff --git a/Koha/Patron.pm b/Koha/Patron.pm >index dc87674f4d..19a9215c86 100644 >--- a/Koha/Patron.pm >+++ b/Koha/Patron.pm >@@ -202,10 +202,6 @@ sub store { > $self->surname( uc($self->surname) ) > if C4::Context->preference("uppercasesurnames"); > >- $self->relationship(undef) # We do not want to store an empty string in this field >- if defined $self->relationship >- and $self->relationship eq ""; >- > unless ( $self->in_storage ) { #AddMember > > # Generate a valid userid/login if needed >diff --git a/about.pl b/about.pl >index bfe39dbd73..27cf186906 100755 >--- a/about.pl >+++ b/about.pl >@@ -500,8 +500,6 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; > SELECT COUNT(*) > FROM ( > SELECT relationship FROM borrower_relationships WHERE relationship='_bad_data' >- UNION ALL >- SELECT relationship FROM borrowers WHERE relationship='_bad_data') a > }); > > $bad_relationships_count = $bad_relationships_count->[0]->[0]; >@@ -510,8 +508,6 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; > SELECT DISTINCT(relationship) > FROM ( > SELECT relationship FROM borrower_relationships WHERE relationship IS NOT NULL >- UNION ALL >- SELECT relationship FROM borrowers WHERE relationship IS NOT NULL) a > }); > > my %valid_relationships = map { $_ => 1 } split( /,|\|/, C4::Context->preference('borrowerRelationship') ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def >index a8d15914c1..cd1cd9042b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def >+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def >@@ -6,7 +6,6 @@ > <field name="borrowers.initials">Initials</field> > <field name="borrowers.othernames">Other name</field> > <field name="borrowers.sex">Gender</field> >-<field name="borrowers.relationship">Relationship</field> > <field name="borrowers.streetnumber">Street number</field> > <field name="borrowers.streettype">Street type</field> > <field name="borrowers.address">Address</field> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 62ce7c1602..3f8bcebdd5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -263,7 +263,7 @@ > [% IF warnRelationships %] > <h2>Patron relationship problems</h2> > [% IF bad_relationships_count %] >- <p>Your database contained guarantee/guarantor pairs with no defined relationship. They have been set the value '_bad_data' in the [% "borrowers.relationship" | $HtmlTags tag="strong" %] and/or [% "borrower_relationships.relationship" | $HtmlTags tag="strong" %] columns. Fix them manually by recreating those relationships, or have your system's administrator correct the values.</p> >+ <p>Your database contained guarantee/guarantor pairs with no defined relationship. They have been set the value '_bad_data' in the [% "borrower_relationships.relationship" | $HtmlTags tag="strong" %] column. Fix them manually by recreating those relationships, or have your system's administrator correct the values.</p> > [% END %] > > [% IF wrong_relationships %] >@@ -273,7 +273,7 @@ > <li>[% rel.0 | html %]</li> > [% END %] > </ul> >- <p>If the relationship is one you want, please add it to the 'borrowerRelationship' system preference, otherwise have your system's administrator correct the values in [% "borrowers.relationship" | $HtmlTags tag="strong" %] and/or [% "borrower_relationships.relationship" | $HtmlTags tag="strong" %] in the database.</p> >+ <p>If the relationship is one you want, please add it to the 'borrowerRelationship' system preference, otherwise have your system's administrator correct the values in [% "borrower_relationships.relationship" | $HtmlTags tag="strong" %] in the database.</p> > [% END %] > [% END %] > >diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t >index 120e981324..b719aa41cc 100755 >--- a/t/db_dependent/Koha/Patrons.t >+++ b/t/db_dependent/Koha/Patrons.t >@@ -1774,7 +1774,7 @@ subtest 'Test Koha::Patrons::merge' => sub { > }; > > subtest '->store' => sub { >- plan tests => 7; >+ plan tests => 6; > my $schema = Koha::Database->new->schema; > $schema->storage->txn_begin; > >@@ -1813,10 +1813,6 @@ subtest '->store' => sub { > is( $patron_1->surname, $surname, > 'Surname remains unchanged on store.'); > >- # Test relationship >- $patron_1->relationship("")->store; >- is( $patron_1->relationship, undef, ); >- > $schema->storage->dbh->{PrintError} = $print_error; > $schema->storage->txn_rollback; > >-- >2.11.0
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 26995
:
115532
|
115533
|
115534
|
115537
|
115538
|
115539
|
120399
|
120400
|
120451
|
120452
|
120453
|
120744
| 120745 |
120746
|
120775
|
120793
|
120826