Attachment #123856 for bug #24387

View | Details | Raw Unified | Return to bug 24387
Collapse All | Expand All

Lines 72-79 sub search_for_display { Link Here

(-)a/Koha/AdditionalContents.pm (-2 / +2 lines)
72	my $search_params;	72	my $search_params;
73	$search_params->{location} = $params->{location};	73	$search_params->{location} = $params->{location};
74	$search_params->{branchcode} = [ $params->{library_id}, undef ] if $params->{library_id};	74	$search_params->{branchcode} = [ $params->{library_id}, undef ] if $params->{library_id};
75	$search_params->{published_on} = { '<=' => \'NOW()' };	75	$search_params->{published_on} = { '<=' => \'CAST(NOW() AS DATE)' };
76	$search_params->{-or} = [ expirationdate => { '>=' => \'NOW()' },	76	$search_params->{-or} = [ expirationdate => { '>=' => \'CAST(NOW() AS DATE)' },
77	expirationdate => undef ];	77	expirationdate => undef ];
78		78
79	if ( $params->{lang} ) {	79	if ( $params->{lang} ) {




use Koha::Biblioitem;
use Koha::Item;
use Koha::Hold;
use Koha::AdditionalContents;
use Koha::Serial;
use Koha::Subscription;
use Koha::Suggestion;

        my $branchcode = $library->{branchcode};

        Koha::AdditionalContents->delete;
        my $news_item = $builder->build_object(
            {
                class => 'Koha::AdditionalContents',
                value => {
                    category        => 'news',
                    location        => "slip",
                    branchcode      => $branchcode,
                    lang            => 'default',
                    title           => "A wonderful news",
                    content         => "This is the wonderful news.",
                    expiration_date => undef,
                    published_on    => $one_minute_ago
                }
            }
        );

        # historic syntax
        my $template = <<EOF;
- 

Return to bug 24387

Lines 39-45 use Koha::Biblio; Link Here

(-)a/t/db_dependent/Letters/TemplateToolkit.t (-10 / +14 lines)
39	use Koha::Biblioitem;	39	use Koha::Biblioitem;
40	use Koha::Item;	40	use Koha::Item;
41	use Koha::Hold;	41	use Koha::Hold;
42	use Koha::AdditionalContent;	42	use Koha::AdditionalContents;
43	use Koha::Serial;	43	use Koha::Serial;
44	use Koha::Subscription;	44	use Koha::Subscription;
45	use Koha::Suggestion;	45	use Koha::Suggestion;
Lines 631-646 EOF Link Here
631	my $branchcode = $library->{branchcode};	631	my $branchcode = $library->{branchcode};
632		632
633	Koha::AdditionalContents->delete;	633	Koha::AdditionalContents->delete;
634	my $news_item = Koha::AdditionalContent->new(	634	my $news_item = $builder->build_object(
635	{	635	{
636	branchcode => $branchcode,	636	class => 'Koha::AdditionalContents',
637	title => "A wonderful news",	637	value => {
638	content => "This is the wonderful news.",	638	category => 'news',
639	lang => "slip",	639	location => "slip",
640	expiration_date => undef,	640	branchcode => $branchcode,
641	published_on => $one_minute_ago	641	lang => 'default',
		642	title => "A wonderful news",
		643	content => "This is the wonderful news.",
		644	expiration_date => undef,
		645	published_on => $one_minute_ago
		646	}
642	}	647	}
643	)->store;	648	);
644		649
645	# historic syntax	650	# historic syntax
646	my $template = <<EOF;	651	my $template = <<EOF;
647	-