Bugzilla – Attachment 57650 Details for
Bug 17642
Authorised values code is broken because of the refactoring
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17642: Try to fix AV code
Bug-17642-Try-to-fix-AV-code.patch (text/plain), 6.34 KB, created by
Martin Renvoize (ashimema)
on 2016-11-18 15:50:55 UTC
(
hide
)
Description:
Bug 17642: Try to fix AV code
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2016-11-18 15:50:55 UTC
Size:
6.34 KB
patch
obsolete
>From a9f6a88afa6087f7250728731fc6320ae831a304 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 16 Nov 2016 10:49:03 +0000 >Subject: [PATCH] Bug 17642: Try to fix AV code > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > Koha/AuthorisedValues.pm | 4 ++-- > t/db_dependent/AuthorisedValues.t | 37 +++++++++++++++++++++++++++++++++++-- > 2 files changed, 37 insertions(+), 4 deletions(-) > >diff --git a/Koha/AuthorisedValues.pm b/Koha/AuthorisedValues.pm >index 11a4404..2a31699 100644 >--- a/Koha/AuthorisedValues.pm >+++ b/Koha/AuthorisedValues.pm >@@ -87,7 +87,7 @@ sub search_by_koha_field { > my $frameworkcode = $params->{frameworkcode} || ''; > my $kohafield = $params->{kohafield}; > my $category = $params->{category}; >- my $authorised_value = $params->{authorised_value}; >+ #my $authorised_value = $params->{authorised_value}; > > return unless $kohafield; > >@@ -95,7 +95,7 @@ sub search_by_koha_field { > { 'marc_subfield_structures.frameworkcode' => $frameworkcode, > 'marc_subfield_structures.kohafield' => $kohafield, > ( defined $category ? ( category_name => $category ) : () ), >- ( $authorised_value ? ( authorised_value => $authorised_value ) : () ), >+ ( exists $params->{authorised_value} ? ( 'me.authorised_value' => $params->{authorised_value} ) : () ), > }, > { join => { category => 'marc_subfield_structures' }, > distinct => 1, >diff --git a/t/db_dependent/AuthorisedValues.t b/t/db_dependent/AuthorisedValues.t >index 82adaa9..4871712 100644 >--- a/t/db_dependent/AuthorisedValues.t >+++ b/t/db_dependent/AuthorisedValues.t >@@ -19,6 +19,7 @@ $dbh->do("DELETE FROM authorised_value_categories"); > # insert > Koha::AuthorisedValueCategory->new({ category_name => 'av_for_testing' })->store; > Koha::AuthorisedValueCategory->new({ category_name => 'aaav_for_testing' })->store; >+Koha::AuthorisedValueCategory->new({ category_name => 'restricted_for_testing' })->store; > my $av1 = Koha::AuthorisedValue->new( > { > category => 'av_for_testing', >@@ -58,6 +59,22 @@ my $av4 = Koha::AuthorisedValue->new( > imageurl => 'image4.png', > } > )->store(); >+my $av_empty_string = Koha::AuthorisedValue->new( >+ { >+ category => 'restricted_for_testing', >+ authorised_value => undef, # Should have been defaulted to "" >+ lib => 'display value undef', >+ lib_opac => 'opac display value undef', >+ } >+)->store(); >+my $av_0 = Koha::AuthorisedValue->new( >+ { >+ category => 'restricted_for_testing', >+ authorised_value => 0, >+ lib => 'display value 0', >+ lib_opac => 'opac display value 0', >+ } >+)->store(); > > ok( $av1->id(), 'AV 1 is inserted' ); > ok( $av2->id(), 'AV 2 is inserted' ); >@@ -97,7 +114,7 @@ my $limits = $av1->branch_limitations; > is( @$limits, 2, 'branch_limitations functions correctly both as setter and getter' ); > > my @categories = Koha::AuthorisedValues->new->categories; >-is( @categories, 2, 'There should have 2 categories inserted' ); >+is( @categories, 3, 'There should have 2 categories inserted' ); > is( $categories[0], $av4->category, 'The first category should be correct (ordered by category name)' ); > is( $categories[1], $av1->category, 'The second category should be correct (ordered by category name)' ); > >@@ -109,11 +126,14 @@ subtest 'search_by_*_field' => sub { > $mss->delete if $mss; > $mss = Koha::MarcSubfieldStructures->search( { tagfield => 952, tagsubfield => 'd', frameworkcode => '' } ); > $mss->delete if $mss; >+ $mss = Koha::MarcSubfieldStructures->search( { tagfield => 952, tagsubfield => '5', frameworkcode => '' } ); >+ $mss->delete if $mss; > Koha::AuthorisedValueCategory->new( { category_name => 'LOC' } )->store; > Koha::AuthorisedValueCategory->new( { category_name => 'ANOTHER_4_TESTS' } )->store; > Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => 'c', frameworkcode => '', authorised_value => 'LOC', kohafield => 'items.location' } )->store; > Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => 'c', frameworkcode => 'ACQ', authorised_value => 'LOC', kohafield => 'items.location' } )->store; > Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => 'd', frameworkcode => '', authorised_value => 'ANOTHER_4_TESTS', kohafield => 'items.another_field' } )->store; >+ Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => '5', frameworkcode => '', authorised_value => 'restricted_for_testing', kohafield => 'items.restricted' } )->store; > Koha::AuthorisedValue->new( { category => 'LOC', authorised_value => 'location_1' } )->store; > Koha::AuthorisedValue->new( { category => 'LOC', authorised_value => 'location_2' } )->store; > Koha::AuthorisedValue->new( { category => 'LOC', authorised_value => 'location_3' } )->store; >@@ -131,12 +151,25 @@ subtest 'search_by_*_field' => sub { > is( $avs->next->authorised_value, 'location_1', ); > }; > subtest 'search_by_koha_field' => sub { >- plan tests => 3; >+ plan tests => 8; > my $avs; > $avs = Koha::AuthorisedValues->search_by_koha_field(); > is ( $avs, undef ); > $avs = Koha::AuthorisedValues->search_by_koha_field( { kohafield => 'items.location', tagfield => 952, tagsubfield => 'c' } ); > is( $avs->count, 3, ); > is( $avs->next->authorised_value, 'location_1', ); >+ >+ # Test authorised_value = 0 >+ $avs = Koha::AuthorisedValues->search_by_koha_field( { kohafield => 'items.restricted', authorised_value => 0 } ); >+ is( $avs->count, 1, ); >+ is( $avs->next->lib, $av_0->lib, ); >+ # Test authorised_value = "" >+ $avs = Koha::AuthorisedValues->search_by_koha_field( { kohafield => 'items.restricted', authorised_value => '' } ); >+ is( $avs->count, 1, ); >+ is( $avs->next->lib, $av_empty_string->lib, ); >+ # Test authorised_value = undef => we do not want to retrieve anything >+ $avs = Koha::AuthorisedValues->search_by_koha_field( { kohafield => 'items.restricted', authorised_value => undef } ); >+ is( $avs->count, 0, ); >+ > }; > }; >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=57650">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17642
:
57533
|
57569
|
57570
|
57571
|
57572
|
57573
|
57574
|
57595
|
57616
|
57628
|
57629
|
57630
|
57631
|
57632
|
57633
|
57634
|
57635
| 57650 |
57651
|
57652
|
57653
|
57654
|
57655
|
57656
|
57657