Bugzilla – Attachment 120387 Details for
Bug 22544
Move C4:NewsChannels to Koha namespace
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22544: Update search_for_display to be able to take more types
Bug-22544-Update-searchfordisplay-to-be-able-to-ta.patch (text/plain), 2.16 KB, created by
Jonathan Druart
on 2021-05-03 09:54:19 UTC
(
hide
)
Description:
Bug 22544: Update search_for_display to be able to take more types
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2021-05-03 09:54:19 UTC
Size:
2.16 KB
patch
obsolete
>From 5d16fcd081654f815a947ab793da83ca6ddb7563 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Thu, 1 Oct 2020 05:03:52 +0000 >Subject: [PATCH] Bug 22544: Update search_for_display to be able to take more > types > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/News.pm | 4 ++-- > t/db_dependent/Koha/News.t | 5 ++++- > 2 files changed, 6 insertions(+), 3 deletions(-) > >diff --git a/Koha/News.pm b/Koha/News.pm >index 79f2a2104a3..923805fbffe 100644 >--- a/Koha/News.pm >+++ b/Koha/News.pm >@@ -75,7 +75,7 @@ sub search_for_display { > $search_params->{lang} = [ $params->{type}, '' ]; > } elsif ( $params->{type} eq 'opac' && $params->{lang} ) { > $search_params->{lang} = [ $params->{lang}, '' ]; >- } elsif ( $params->{type} eq 'OpacNavRight' && $params->{lang} ) { >+ } elsif ( $params->{lang} ) { > $search_params->{lang} = $params->{type} . '_' . $params->{lang}; > } else { > Koha::Exceptions::BadParameter->throw("The type and lang parameters combination is not valid"); >@@ -90,7 +90,7 @@ sub search_for_display { > return $self->SUPER::search($search_params, { order_by => 'number' }); > } > >-=head3 type >+=head3 _type > > =cut > >diff --git a/t/db_dependent/Koha/News.t b/t/db_dependent/Koha/News.t >index 4572286b30d..d93a07d4114 100755 >--- a/t/db_dependent/Koha/News.t >+++ b/t/db_dependent/Koha/News.t >@@ -143,7 +143,7 @@ subtest '->author' => sub { > > subtest '->search_for_display' => sub { > >- plan tests => 12; >+ plan tests => 13; > > $schema->storage->txn_begin; > >@@ -248,6 +248,9 @@ subtest '->search_for_display' => sub { > $news = Koha::News->search_for_display({ library_id => $library2->branchcode}); > is($news->count, 2, 'Filtering by library returns right number of news items'); > >+ $news = Koha::News->search_for_display({ type => 'NonExistantType', lang => 'en'}); >+ is($news->count, 0, 'Non-existant type is searched, but should not find any item'); >+ > throws_ok { Koha::News->search_for_display({type => 'opac'}) } 'Koha::Exceptions::BadParameter', > 'Exception raised when type is opac and no language given'; > >-- >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 22544
:
86772
|
86773
|
86774
|
86775
|
86776
|
86777
|
86780
|
86781
|
90103
|
90104
|
90105
|
90106
|
90107
|
90108
|
90109
|
90110
|
92005
|
92006
|
92007
|
92008
|
92009
|
92010
|
92011
|
92012
|
95613
|
95614
|
95615
|
95627
|
95628
|
95629
|
95630
|
95631
|
95632
|
95633
|
95634
|
99849
|
99850
|
99851
|
99852
|
99853
|
99854
|
99855
|
99856
|
99857
|
104176
|
104177
|
104178
|
104179
|
104180
|
104181
|
104182
|
104183
|
104184
|
111012
|
111013
|
111014
|
111015
|
111016
|
111017
|
111018
|
111019
|
111020
|
111021
|
111022
|
111023
|
115135
|
115136
|
115137
|
115138
|
115139
|
115140
|
115141
|
115142
|
115143
|
115144
|
115145
|
115146
|
115218
|
115296
|
115297
|
115298
|
115299
|
116933
|
116934
|
116935
|
117479
|
117480
|
117481
|
117482
|
117483
|
117484
|
117485
|
117486
|
117487
|
117488
|
117489
|
117490
|
117491
|
117492
|
117493
|
117494
|
117495
|
117496
|
117497
|
118054
|
118055
|
118056
|
118057
|
118058
|
118059
|
118060
|
118061
|
118062
|
118063
|
118064
|
118065
|
118066
|
118067
|
118068
|
118069
|
118070
|
118071
|
118072
|
118073
|
118087
|
118088
|
118089
|
118090
|
118091
|
118092
|
118093
|
118094
|
118095
|
118096
|
118097
|
118098
|
118099
|
118100
|
118101
|
118102
|
118103
|
118104
|
118105
|
118106
|
120377
|
120378
|
120379
|
120380
|
120381
|
120382
|
120383
|
120384
|
120385
|
120386
|
120387
|
120388
|
120389
|
120390
|
120391
|
120392
|
120393
|
120394
|
120395
|
120396
|
122396
|
122397
|
122398
|
122399
|
122400
|
122401
|
122402
|
122403
|
122404
|
122405
|
122406
|
122407
|
122408
|
122409
|
122410
|
122411
|
122412
|
122413
|
122414
|
122415