From 82e05201747085e4f52644c6a50ae122a1201d94 Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 19 Mar 2023 22:42:04 +0100 Subject: [PATCH 1/2] fix image paths --- website/agenda/css/calcms.css | 2 +- website/agenda/templates/default/event_media.rss.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/agenda/css/calcms.css b/website/agenda/css/calcms.css index 4974cfa..b33ab70 100644 --- a/website/agenda/css/calcms.css +++ b/website/agenda/css/calcms.css @@ -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; } diff --git a/website/agenda/templates/default/event_media.rss.xml b/website/agenda/templates/default/event_media.rss.xml index c0bb1c0..05f17f5 100644 --- a/website/agenda/templates/default/event_media.rss.xml +++ b/website/agenda/templates/default/event_media.rss.xml @@ -39,7 +39,7 @@ Content-type:application/rss+xml; charset=UTF-8 http://.html#comments - + From 2b1ffda88d97bca67eb58fdaaf96ecb2b3f19ea0 Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 19 Mar 2023 22:44:17 +0100 Subject: [PATCH 2/2] series*.pm: set default for zero values newer database versions are stricter on trying to write '' to integer columns. --- lib/calcms/series.pm | 3 +++ lib/calcms/series_events.pm | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/calcms/series.pm b/lib/calcms/series.pm index 1ece629..7c84a31 100644 --- a/lib/calcms/series.pm +++ b/lib/calcms/series.pm @@ -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}; diff --git a/lib/calcms/series_events.pm b/lib/calcms/series_events.pm index ee510f6..f493b39 100644 --- a/lib/calcms/series_events.pm +++ b/lib/calcms/series_events.pm @@ -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' );