diff --git a/fet2020/authentications/decorators.py b/fet2020/authentications/decorators.py index 812721fd..8059b93e 100644 --- a/fet2020/authentications/decorators.py +++ b/fet2020/authentications/decorators.py @@ -16,7 +16,7 @@ def authenticated_user(view_func): if request.user.is_authenticated: return view_func(request, *args, **kwargs) else: - return redirect('home') + return redirect('login') return wrapper_func diff --git a/fet2020/posts/forms.py b/fet2020/posts/forms.py index f66ec70d..a853775b 100644 --- a/fet2020/posts/forms.py +++ b/fet2020/posts/forms.py @@ -108,7 +108,7 @@ class EventForm(PostForm): self.fields['event_place'].required = True -class FetMeetingForm(EventForm): +class FetMeetingForm(PostForm): # agenda_html = forms.CharField(widget = forms.TextInput()) class Meta: model = FetMeeting @@ -131,7 +131,6 @@ class FetMeetingForm(EventForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # to get the self.fields set - self.fields['author'].queryset = self.fields['author'].queryset.order_by('username') self.fields['event_start'].required = True self.fields['event_end'].required = False diff --git a/fet2020/tasks/views.py b/fet2020/tasks/views.py index df098abc..5b68db00 100644 --- a/fet2020/tasks/views.py +++ b/fet2020/tasks/views.py @@ -7,8 +7,10 @@ from collections import deque from .forms import TaskForm from .models import Task, TaskList +from authentications.decorators import authenticated_user +@authenticated_user def index(request): current_user = request.user.id current_action = False diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html index 114f2d4e..a8e7adac 100644 --- a/fet2020/templates/members/jobs_list.html +++ b/fet2020/templates/members/jobs_list.html @@ -5,7 +5,7 @@
-

{{jobmem.grouper}} #

+

{{jobmem.grouper}} #

Aktuelle Mitglieder:
diff --git a/fet2020/templates/posts/fet_calendar.ics b/fet2020/templates/posts/fet_calendar.ics index 46947b69..4c4f71cf 100644 --- a/fet2020/templates/posts/fet_calendar.ics +++ b/fet2020/templates/posts/fet_calendar.ics @@ -22,13 +22,13 @@ END:STANDARD END:VTIMEZONE {% for event in events %} BEGIN:VEVENT UID:{{event.id}} -ORGANIZER;CN="Fachschaft Elektrotechnik, Example Inc.":MAILTO:service@fet.at +ORGANIZER;CN="Fachschaft Elektrotechnik":MAILTO:service@fet.at LOCATION:Vienna SUMMARY:{{ event.title }} -DESCRIPTION: https://alpha.2020.fet.at{{event.url}} {{even.title}} +DESCRIPTION: {{ request.scheme }}://{{ request.get_host }}{{ event.url }} {{ even.title }} CLASS:PUBLIC -DTSTART;TZID=Europe/Vienna:{{ event.event_start|date:'Ymd'}}T{{ event.event_start|time:'His'}} -DTEND;TZID=Europe/Vienna:{{ event.event_end|date:'Ymd'}}T{{ event.event_end|time:'His'}} -DTSTAMP;TZID=Europe/Vienna:{{ event.event_start|date:'Ymd'}}T{{ event.event_start|time:'His'}} -END:VEVENT{% endfor %} +DTSTART;TZID=Europe/Vienna:{{ event.event_start|date:'Ymd' }}T{{ event.event_start|time:'His' }} +DTEND;TZID=Europe/Vienna:{{ event.event_end|date:'Ymd' }}T{{ event.event_end|time:'His' }} +DTSTAMP;TZID=Europe/Vienna:{{ event.event_start|date:'Ymd' }}T{{ event.event_start|time:'His' }} +END:VEVENT {% endfor %} END:VCALENDAR \ No newline at end of file