Merge branch 'master' of ssh://u80n5uq91vydb8wl.myfritz.net/~/Homepages/feuerwehr-eppingen

This commit is contained in:
Marco Glietsch 2021-11-25 07:24:25 +01:00
commit b370fc7133
2 changed files with 3 additions and 3 deletions

View File

@ -66,7 +66,7 @@ class URLHelper
$url .= "/" . $post->type . "/" .$year. "/" .$department. "/". $instance; $url .= "/" . $post->type . "/" .$year. "/" .$department. "/". $instance;
if(is_string($suffix)) if(is_string($suffix))
{ {
$url .= "/$suffix"; $url .= "/dienstplan.$suffix";
} }
$url .= $slug; $url .= $slug;
break; break;

View File

@ -345,7 +345,7 @@ class ServiceController extends PostController
$viewFile = 'inc.views.details'; $viewFile = 'inc.views.details';
break; break;
case 'ical': case 'dienstplan.ical':
$viewFile = 'inc.views.iCal'; $viewFile = 'inc.views.iCal';
break; break;
} }
@ -357,7 +357,7 @@ class ServiceController extends PostController
switch($type) switch($type)
{ {
case 'ical': case 'dienstplan.ical':
$response = Response::make($view, 200); $response = Response::make($view, 200);
$response->header("Content-Disposition", "attachment; filename=Dienstplan-$year-$department-$instance.ics"); $response->header("Content-Disposition", "attachment; filename=Dienstplan-$year-$department-$instance.ics");
$response->header("Content-Type", "text/calendar; charset=utf-8"); $response->header("Content-Type", "text/calendar; charset=utf-8");