@@ -, +, @@ --- C4/NewsChannels.pm | 42 +------------------ Koha/NewsItem.pm | 35 ++++++++++++++++ .../prog/en/modules/tools/koha-news.tt | 16 ++++--- t/db_dependent/NewsChannels.t | 41 ++---------------- tools/koha-news.pl | 22 ++++------ 5 files changed, 54 insertions(+), 102 deletions(-) --- a/C4/NewsChannels.pm +++ a/C4/NewsChannels.pm @@ -28,7 +28,7 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw( &GetNewsToDisplay - &add_opac_new &upd_opac_new &del_opac_new &get_opac_news + &add_opac_new &upd_opac_new &del_opac_new ); } @@ -123,46 +123,6 @@ sub del_opac_new { } } -sub get_opac_news { - my ($limit, $lang, $branchcode) = @_; - my @values; - my $dbh = C4::Context->dbh; - my $query = q{ - SELECT opac_news.*, branches.branchname, - published_on AS newdate, - borrowers.title AS author_title, - borrowers.firstname AS author_firstname, - borrowers.surname AS author_surname - FROM opac_news LEFT JOIN branches - ON opac_news.branchcode=branches.branchcode - LEFT JOIN borrowers on borrowers.borrowernumber = opac_news.borrowernumber - }; - $query .= ' WHERE 1'; - if ($lang) { - $query .= " AND (opac_news.lang='' OR opac_news.lang=?)"; - push @values,$lang; - } - if ($branchcode) { - $query .= ' AND (opac_news.branchcode IS NULL OR opac_news.branchcode=?)'; - push @values,$branchcode; - } - $query.= ' ORDER BY published_on DESC '; - #if ($limit) { - # $query.= 'LIMIT 0, ' . $limit; - #} - my $sth = $dbh->prepare($query); - $sth->execute(@values); - my @opac_news; - my $count = 0; - while (my $row = $sth->fetchrow_hashref) { - if ((($limit) && ($count < $limit)) || (!$limit)) { - push @opac_news, $row; - } - $count++; - } - return ($count, \@opac_news); -} - =head2 GetNewsToDisplay $news = &GetNewsToDisplay($lang,$branch); --- a/Koha/NewsItem.pm +++ a/Koha/NewsItem.pm @@ -22,6 +22,8 @@ use Modern::Perl; use Carp; use Koha::Database; +use Koha::DateUtils; +use Koha::Libraries; use Koha::Patrons; use base qw(Koha::Object); @@ -53,6 +55,39 @@ sub author { return Koha::Patron->_new_from_dbic($author_rs); } +=head3 is_expired + +my $is_expired = $news_item->is_expired; + +Returns 1 if the news item is expired or 0; + +=cut + +sub is_expired { + my ( $self ) = @_; + + return 0 unless $self->expirationdate; + return 1 if dt_from_string( $self->expirationdate ) < dt_from_string->truncate( to => 'day' ); + return 0; +} + +=head3 library + +my $library = $news_item->library; + +Returns Koha::Library object or undef + +=cut + +sub library { + my ( $self ) = @_; + + my $library_rs = $self->_result->branchcode; + return unless $library_rs; + return Koha::Library->_new_from_dbic( $library_rs ); +} + + =head3 _type =cut --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -7,8 +7,6 @@ [% INCLUDE 'doc-head-open.inc' %] News › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] -[% IF ( opac_news_count ) %] -[% END %] [% UNLESS ( wysiwyg ) %] [% Asset.css("lib/codemirror/codemirror.css") | $raw %] [% Asset.css("lib/codemirror/lint.min.css") | $raw %] @@ -140,7 +138,7 @@
Cancel
[% ELSE %] - [% IF ( opac_news_count ) %] + [% IF ( opac_news.count ) %]
@@ -156,7 +154,7 @@ [% FOREACH opac_new IN opac_news %] - [% IF ( opac_new.expired ) %] + [% IF ( opac_new.is_expired ) %] [% ELSE %] @@ -177,13 +175,13 @@ - - + + - +
Actions
[% IF ( opac_new.branchcode == "" ) -%] All libraries - [% ELSE %][% opac_new.branchname | html %] + [% ELSE %][% opac_new.library.branchname | html %] [% END %] [% opac_new.number | html %][% opac_new.newdate | $KohaDates %][% opac_new.expirationdate | $KohaDates %] [% IF ( opac_new.expired ) %](expired)[% END %][% opac_new.timestamp | $KohaDates %][% opac_new.expirationdate | $KohaDates %] [% IF ( opac_new.is_expired ) %](expired)[% END %] [% opac_new.title | html %][% opac_new.author_title | html %] [% opac_new.author_firstname | html %] [% opac_new.author_surname | html %][% IF ( opac_new.author) %][% INCLUDE 'patron-title.inc' patron=opac_new.author hide_patron_infos_if_needed=1 %][% END %]
Preview content @@ -289,7 +287,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% Asset.js("js/tools-menu.js") | $raw %] - [% IF ( opac_news_count ) %] + [% IF ( opac_news.count ) %] [% INCLUDE 'datatables.inc' %]