kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'calcms/master'

Browse Source 
* series*.pm: set default for zero values
* fix image paths
This commit is contained in:
Milan
2023-03-19 22:46:56 +01:00
parent 72eada03c4 2b1ffda88d
commit 35d7784059
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/calcms/series.pm
View File

@@ -174,6 +174,9 @@ sub update ($$) {
for my $column ( keys %$columns ) {
$entry->{$column} = $series->{$column} if defined $series->{$column};
}
for my $column ('live', 'count_episodes', 'predecessor_id') {
$entry->{$column} = 0 unless $entry->{$column};
}
$entry->{image} = images::normalizeName( $entry->{image} ) if defined $entry->{image};
$entry->{id} = $series->{series_id};

1
lib/calcms/series_events.pm
View File

@@ -77,6 +77,7 @@ sub save_content($$) {
{
push @keys, $key if defined $entry->{$key};
}
$entry->{rerun} = 0 unless $entry->{rerun};
$entry->{episode} = undef if ( defined $entry->{episode} ) && ( $entry->{episode} eq '0' );
$entry->{published} = 0 if ( defined $entry->{draft} ) && ( $entry->{draft} eq '1' );

2
website/agenda/css/calcms.css
View File

@@ -650,7 +650,7 @@ a.load-prev, a.load-next{
#calcms_search select {
background: white;
background-image: url("/agenda/image/select.png");
background-image: url("/agenda/images/select.png");
background-position: right center;
background-repeat: no-repeat;
}

2
website/agenda/templates/default/event_media.rss.xml
View File

@@ -39,7 +39,7 @@ Content-type:application/rss+xml; charset=UTF-8
<comments>http:<TMPL_VAR base_domain>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments</comments>
<enclosure url="https:<TMPL_VAR listen_url>" length="<TMPL_VAR size>" type="audio/mpeg" />
<itunes:duration><TMPL_VAR duration></itunes:duration>
<media:content url="http:<TMPL_VAR base_domain>media/image/<TMPL_VAR image>" medium="image">
<media:content url="http:<TMPL_VAR base_domain>media/images/<TMPL_VAR image>" medium="image">
<media:title type="html"><TMPL_VAR full_title></media:title>
</media:content>
<media:content url="https:<TMPL_VAR listen_url>" medium="audio" />