Bugzilla – Attachment 86776 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: Move add_opac_item to Koha namespace
Bug-22544-Move-addopacitem-to-Koha-namespace.patch (text/plain), 5.70 KB, created by
Josef Moravec
on 2019-03-20 07:49:05 UTC
(
hide
)
Description:
Bug 22544: Move add_opac_item to Koha namespace
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2019-03-20 07:49:05 UTC
Size:
5.70 KB
patch
obsolete
>From 2bdf5c37df09a0116521cef5fda30b7421f90193 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Tue, 19 Mar 2019 10:35:23 +0000 >Subject: [PATCH] Bug 22544: Move add_opac_item to Koha namespace > >--- > C4/NewsChannels.pm | 28 ------------------ > t/db_dependent/NewsChannels.t | 66 +------------------------------------------ > tools/koha-news.pl | 22 +++++++-------- > 3 files changed, 11 insertions(+), 105 deletions(-) > >diff --git a/C4/NewsChannels.pm b/C4/NewsChannels.pm >index 75c8c13bd2..372d8b9efb 100644 >--- a/C4/NewsChannels.pm >+++ b/C4/NewsChannels.pm >@@ -28,7 +28,6 @@ BEGIN { > @ISA = qw(Exporter); > @EXPORT = qw( > &GetNewsToDisplay >- &add_opac_new > ); > } > >@@ -44,33 +43,6 @@ This module provides the functions needed to mange OPAC and intranet news. > > =cut > >-=head2 add_opac_new >- >- $retval = add_opac_new($hashref); >- >- $hashref should contains all the fields found in opac_news, >- except idnew. The idnew field is auto-generated. >- >-=cut >- >-sub add_opac_new { >- my ($href_entry) = @_; >- my $retval = 0; >- >- if ($href_entry) { >- my @fields = keys %{$href_entry}; >- my @values = values %{$href_entry}; >- my $field_string = join ',', @fields; >- $field_string = $field_string // q{}; >- my $values_string = join(',', map { '?' } @fields); >- my $dbh = C4::Context->dbh; >- my $sth = $dbh->prepare("INSERT INTO opac_news ( $field_string ) VALUES ( $values_string )"); >- $sth->execute(@values); >- $retval = 1; >- } >- return $retval; >-} >- > =head2 GetNewsToDisplay > > $news = &GetNewsToDisplay($lang,$branch); >diff --git a/t/db_dependent/NewsChannels.t b/t/db_dependent/NewsChannels.t >index 0a66177a3e..20e8ae12e9 100644 >--- a/t/db_dependent/NewsChannels.t >+++ b/t/db_dependent/NewsChannels.t >@@ -6,7 +6,7 @@ use Koha::DateUtils; > use Koha::Libraries; > use Koha::News; > >-use Test::More tests => 7; >+use Test::More tests => 4; > > BEGIN { > use_ok('C4::NewsChannels'); >@@ -61,70 +61,6 @@ my $brwrnmbr; > # Must have valid borrower number, or tests are meaningless. > ok ( defined $brwrnmbr ); > >-# Test add_opac_new >-my $rv = add_opac_new(); # intentionally bad >-is( $rv, 0, 'Correctly failed on no parameter!' ); >- >-my $timestamp = '2000-01-01'; >-my ( $timestamp1, $timestamp2 ) = ( $timestamp, $timestamp ); >-my $timestamp3 = '2000-01-02'; >-my ( $title1, $new1, $lang1, $expirationdate1, $number1 ) = >- ( 'News Title', '<p>We have some exciting news!</p>', q{}, '2999-12-30', 1 ); >-my $href_entry1 = { >- title => $title1, >- content => $new1, >- lang => $lang1, >- expirationdate => $expirationdate1, >- timestamp => $timestamp1, >- number => $number1, >- branchcode => 'LIB1', >-}; >- >-$rv = add_opac_new($href_entry1); >-is( $rv, 1, 'Successfully added the first dummy news item!' ); >- >-my ( $title2, $new2, $lang2, $expirationdate2, $number2 ) = >- ( 'News Title2', '<p>We have some exciting news!</p>', q{}, '2999-12-31', 1 ); >-my $href_entry2 = { >- title => $title2, >- content => $new2, >- lang => $lang2, >- expirationdate => $expirationdate2, >- timestamp => $timestamp2, >- number => $number2, >- borrowernumber => $brwrnmbr, >- branchcode => 'LIB1', >-}; >-$rv = add_opac_new($href_entry2); >-is( $rv, 1, 'Successfully added the second dummy news item!' ); >- >-my ( $title3, $new3, $lang3, $number3 ) = >- ( 'News Title3', '<p>News without expiration date</p>', q{}, 1 ); >-my $href_entry3 = { >- title => $title3, >- content => $new3, >- lang => $lang3, >- timestamp => $timestamp3, >- number => $number3, >- borrowernumber => $brwrnmbr, >- branchcode => 'LIB1', >-}; >-$rv = add_opac_new($href_entry3); >-is( $rv, 1, 'Successfully added the third dummy news item without expiration date!' ); >- >-# We need to determine the idnew in a non-MySQLism way. >-# This should be good enough. >-my $query = >-q{ SELECT idnew from opac_news WHERE timestamp='2000-01-01' AND expirationdate='2999-12-30'; }; >-my ( $idnew1 ) = $dbh->selectrow_array( $query ); >-$query = >-q{ SELECT idnew from opac_news WHERE timestamp='2000-01-01' AND expirationdate='2999-12-31'; }; >-my ( $idnew2 ) = $dbh->selectrow_array( $query ); >- >-$query = >-q{ SELECT idnew from opac_news WHERE timestamp='2000-01-02'; }; >-my ( $idnew3 ) = $dbh->selectrow_array( $query ); >- > # Test GetNewsToDisplay > my ( $opac_news_count, $arrayref_opac_news ) = GetNewsToDisplay( q{}, 'LIB1' ); > ok( $opac_news_count >= 2, 'Successfully tested GetNewsToDisplay for LIB1!' ); >diff --git a/tools/koha-news.pl b/tools/koha-news.pl >index c54f6cbe8e..aa386e0a58 100755 >--- a/tools/koha-news.pl >+++ b/tools/koha-news.pl >@@ -104,18 +104,16 @@ if ( $op eq 'add_form' ) { > } > elsif ( $op eq 'add' ) { > if ($title) { >- add_opac_new( >- { >- title => $title, >- content => $content, >- lang => $lang, >- expirationdate => $expirationdate, >- timestamp => $timestamp, >- number => $number, >- branchcode => $branchcode, >- borrowernumber => $borrowernumber, >- } >- ); >+ my $new = Koha::NewsItem->new({ >+ title => $title, >+ content => $content, >+ lang => $lang, >+ expirationdate => $expirationdate, >+ timestamp => $timestamp, >+ number => $number, >+ branchcode => $branchcode, >+ borrowernumber => $borrowernumber, >+ })->store; > print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl"); > } > else { >-- >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 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