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

set series predecessor

Browse Source 
if series move to another project or studio you can link the new series
to the existing one.
This commit is contained in:
Milan
2020-02-29 20:51:31 +01:00
parent 775ff5f761
commit eb2986e1da
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install/migrate.sql
View File

@@ -247,3 +247,6 @@ ALTER TABLE `calcms`.`calcms_user_settings`
ADD COLUMN `project_id` INT(10) UNSIGNED NULL AFTER `calendar_fontsize`, ADD COLUMN `project_id` INT(10) UNSIGNED NULL AFTER `calendar_fontsize`,
ADD COLUMN `studio_id` INT(10) UNSIGNED NULL AFTER `project_id`; 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`;

1
lib/calcms/series.pm
View File

@@ -1282,7 +1282,6 @@ sub update_recurring_event($$) {
where id=? where id=?
}; };
#print STDERR $update_sql."\n".Dumper($bind_values)."\n";
my $dbh = db::connect($config); my $dbh = db::connect($config);
db::put( $dbh, $update_sql, $bind_values ); db::put( $dbh, $update_sql, $bind_values );
} }

3
website/agenda/planung/pot/de/series.po
View File

@@ -74,6 +74,9 @@ msgstr "interne Kommentare"
msgid "template_podcast_url" msgid "template_podcast_url"
msgstr "Podcast URL" msgstr "Podcast URL"
msgid "template_predecessor_id"
msgstr "ID der Vorgänger-Serie"
msgid "template_archive_url" msgid "template_archive_url"
msgstr "Archiv URL" msgstr "Archiv URL"

3
website/agenda/planung/pot/en/series.po
View File

@@ -77,6 +77,9 @@ msgstr "Podcast URL"
msgid "template_archive_url" msgid "template_archive_url"
msgstr "Archive URL" msgstr "Archive URL"
msgid "template_predecessor_id"
msgstr "Series Predecessor ID"
msgid "tab_schedule" msgid "tab_schedule"
msgstr "Schedule" msgstr "Schedule"

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

@@ -337,6 +337,7 @@ sub save_series {
$entry->{series_id} = $params->{series_id} || ''; $entry->{series_id} = $params->{series_id} || '';
$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->{html_content} = Encode::decode( 'utf-8', $entry->{content} ); #$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} );
$entry->{html_content} = markup::creole_to_html( $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', 'id', 'project_id', 'studio_id', 'default_studio_id',
'user_id', 'new_series_id', 'series_id', 'schedule_id', 'user_id', 'new_series_id', 'series_id', 'schedule_id',
'exclude', 'show_hint_to_add_schedule', 'event_id', 'weekday', '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+$/ ) ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param}; $checked->{$param} = $params->{$param};
} }

4
website/agenda/planung/templates/edit-series.html
View File

@@ -151,6 +151,10 @@
<tr> <td class="label"><TMPL_VAR .loc.template_comments></td> <tr> <td class="label"><TMPL_VAR .loc.template_comments></td>
<td><textarea name="comment" class="animated" style="width:100%;" placeholder="<TMPL_VAR .loc.template_comments>"><TMPL_VAR comment></textarea></td></tr> <td><textarea name="comment" class="animated" style="width:100%;" placeholder="<TMPL_VAR .loc.template_comments>"><TMPL_VAR comment></textarea></td></tr>
<!--<tr> <td class="label">studio</td> <td><TMPL_VAR studio></td></tr>--> <!--<tr> <td class="label">studio</td> <td><TMPL_VAR studio></td></tr>-->
<tr> <td class="label"><TMPL_VAR .loc.template_predecessor_id></td>
<td><input name="predecessor_id" style="width:100%;" value="<TMPL_VAR predecessor_id>" placeholder="<TMPL_VAR .loc.template_predecessor_id>"></td></tr>
</table> </table>
<div class="buttons"> <div class="buttons">