diff --git a/install/migrate.sql b/install/migrate.sql index 79df2a4..65d67e3 100644 --- a/install/migrate.sql +++ b/install/migrate.sql @@ -247,3 +247,6 @@ ALTER TABLE `calcms`.`calcms_user_settings` ADD COLUMN `project_id` INT(10) UNSIGNED NULL AFTER `calendar_fontsize`, ADD COLUMN `studio_id` INT(10) UNSIGNED NULL AFTER `project_id`; +ALTER TABLE `calcms`.`calcms_series` +ADD COLUMN `predecessor_id` INT(10) NULL AFTER `has_single_events`; + diff --git a/lib/calcms/series.pm b/lib/calcms/series.pm index 31620fe..999dba2 100644 --- a/lib/calcms/series.pm +++ b/lib/calcms/series.pm @@ -1282,7 +1282,6 @@ sub update_recurring_event($$) { where id=? }; - #print STDERR $update_sql."\n".Dumper($bind_values)."\n"; my $dbh = db::connect($config); db::put( $dbh, $update_sql, $bind_values ); } diff --git a/website/agenda/planung/pot/de/series.po b/website/agenda/planung/pot/de/series.po index bd99552..a567384 100644 --- a/website/agenda/planung/pot/de/series.po +++ b/website/agenda/planung/pot/de/series.po @@ -74,6 +74,9 @@ msgstr "interne Kommentare" msgid "template_podcast_url" msgstr "Podcast URL" +msgid "template_predecessor_id" +msgstr "ID der Vorgänger-Serie" + msgid "template_archive_url" msgstr "Archiv URL" diff --git a/website/agenda/planung/pot/en/series.po b/website/agenda/planung/pot/en/series.po index 5117b5d..942d4f1 100644 --- a/website/agenda/planung/pot/en/series.po +++ b/website/agenda/planung/pot/en/series.po @@ -77,6 +77,9 @@ msgstr "Podcast URL" msgid "template_archive_url" msgstr "Archive URL" +msgid "template_predecessor_id" +msgstr "Series Predecessor ID" + msgid "tab_schedule" msgstr "Schedule" diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi index 6155b59..75153f7 100755 --- a/website/agenda/planung/series.cgi +++ b/website/agenda/planung/series.cgi @@ -337,6 +337,7 @@ sub save_series { $entry->{series_id} = $params->{series_id} || ''; $entry->{live} = $params->{live} || 0; $entry->{count_episodes} = $params->{count_episodes} || 0; + $entry->{predecessor_id} = $params->{predecessor_id} // 0; #$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} ); $entry->{html_content} = markup::creole_to_html( $entry->{content} ); @@ -1252,9 +1253,8 @@ sub check_params { 'id', 'project_id', 'studio_id', 'default_studio_id', 'user_id', 'new_series_id', 'series_id', 'schedule_id', 'exclude', 'show_hint_to_add_schedule', 'event_id', 'weekday', - 'week_of_month', 'month', 'nextDay' - ) - { + 'week_of_month', 'month', 'nextDay', 'predecessor_id' + ){ if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) { $checked->{$param} = $params->{$param}; } diff --git a/website/agenda/planung/templates/edit-series.html b/website/agenda/planung/templates/edit-series.html index 4d4a568..73b2064 100644 --- a/website/agenda/planung/templates/edit-series.html +++ b/website/agenda/planung/templates/edit-series.html @@ -151,6 +151,10 @@