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

series.cgi: warn on event predecessor self-reference

Browse Source
This commit is contained in:
Milan
2020-12-15 13:10:26 +01:00
parent 51c6a792a5
commit 2dae999521
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/agenda/planung/calendar.cgi
View File

@@ -466,7 +466,8 @@ sub showCalendar {
series_id => $options->{series_id} series_id => $options->{series_id}
} }
); );
if ((defined $series->[0]) && ( $series->[0]->{predecessor_id})){ if ( defined $series->[0] and $series->[0]->{predecessor_id}
and $series->[0]->{predecessor_id} ne $series->[0]->{id} ){
my $events2 = getSeriesEvents( $config, $request, { my $events2 = getSeriesEvents( $config, $request, {
series_id => $series->[0]->{predecessor_id} series_id => $series->[0]->{predecessor_id}
}, $params ); }, $params );

13
website/agenda/planung/series.cgi
View File

@@ -344,8 +344,11 @@ sub save_series {
$entry->{live} = $params->{live} // 0; $entry->{live} = $params->{live} // 0;
$entry->{count_episodes} = $params->{count_episodes} // 0; $entry->{count_episodes} = $params->{count_episodes} // 0;
$entry->{predecessor_id} = $params->{predecessor_id} // 0; $entry->{predecessor_id} = $params->{predecessor_id} // 0;
#$entry->{content} = $params->{content};
#$entry->{content_format} = $params->{content_format}; if ($entry->{predecessor_id} eq $entry->{series_id}){
uac::print_error( 'Predecessor must be different from series id.' );
return;
}
#$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} ); #$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} );
if ($entry->{content_format} //'' eq "markdown"){ if ($entry->{content_format} //'' eq "markdown"){
@@ -1071,10 +1074,8 @@ sub show_series {
} }
my $serie = $series->[0]; my $serie = $series->[0];
#if ($serie->{has_single_events}==0){ uac::print_error( 'Predecessor must be different from series id.' )
#delete $serie->{has_single_events}; if $serie->{predecessor_id} eq $serie->{series_id};
#$serie->{series_name}='';
#}
#get all users currently assigned to the user #get all users currently assigned to the user
my $user_studios = my $user_studios =