bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Andreas Stephanides
2020-12-28 23:36:11 +00:00
parent d0b3f6ffeb ca8f55f4e4
commit 229ae8af13
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fet2020/authentications/decorators.py
View File

@@ -16,7 +16,7 @@ def authenticated_user(view_func):
if request.user.is_authenticated: if request.user.is_authenticated:
return view_func(request, *args, **kwargs) return view_func(request, *args, **kwargs)
else: else:
return redirect('home') return redirect('login')
return wrapper_func return wrapper_func

3
fet2020/posts/forms.py
View File

@@ -108,7 +108,7 @@ class EventForm(PostForm):
self.fields['event_place'].required = True self.fields['event_place'].required = True
class FetMeetingForm(EventForm): class FetMeetingForm(PostForm):
# agenda_html = forms.CharField(widget = forms.TextInput()) # agenda_html = forms.CharField(widget = forms.TextInput())
class Meta: class Meta:
model = FetMeeting model = FetMeeting
@@ -131,7 +131,6 @@ class FetMeetingForm(EventForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set 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_start'].required = True
self.fields['event_end'].required = False self.fields['event_end'].required = False

2
fet2020/tasks/views.py
View File

@@ -7,8 +7,10 @@ from collections import deque
from .forms import TaskForm from .forms import TaskForm
from .models import Task, TaskList from .models import Task, TaskList
from authentications.decorators import authenticated_user
@authenticated_user
def index(request): def index(request):
current_user = request.user.id current_user = request.user.id
current_action = False current_action = False

2
fet2020/templates/members/jobs_list.html
View File

@@ -5,7 +5,7 @@
<div class="padding-top-1 padding-left-1 padding-right-1" style="background-color: white;"> <div class="padding-top-1 padding-left-1 padding-right-1" style="background-color: white;">
<h2>{{jobmem.grouper}}<a class="headerlink" href="#{{jobmem.list.0.job.slug}}" title="Permalink to {{jobmem.grouper}}"> #</a></h2> <h2>{{jobmem.grouper}}<a class="headerlink" id="{{jobmem.list.0.job.slug}}" href="#{{jobmem.list.0.job.slug}}" title="Permalink to {{jobmem.grouper}}"> #</a></h2>
<b>Aktuelle Mitglieder:</b> <b>Aktuelle Mitglieder:</b>
<div class="grid-x align-bottom"> <div class="grid-x align-bottom">

12
fet2020/templates/posts/fet_calendar.ics
View File

@@ -22,13 +22,13 @@ END:STANDARD
END:VTIMEZONE {% for event in events %} END:VTIMEZONE {% for event in events %}
BEGIN:VEVENT BEGIN:VEVENT
UID:{{event.id}} UID:{{event.id}}
ORGANIZER;CN="Fachschaft Elektrotechnik, Example Inc.":MAILTO:service@fet.at ORGANIZER;CN="Fachschaft Elektrotechnik":MAILTO:service@fet.at
LOCATION:Vienna LOCATION:Vienna
SUMMARY:{{ event.title }} SUMMARY:{{ event.title }}
DESCRIPTION: https://alpha.2020.fet.at{{event.url}} {{even.title}}</a> DESCRIPTION: {{ request.scheme }}://{{ request.get_host }}{{ event.url }} {{ even.title }}</a>
CLASS:PUBLIC CLASS:PUBLIC
DTSTART;TZID=Europe/Vienna:{{ event.event_start|date:'Ymd'}}T{{ event.event_start|time:'His'}} 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'}} 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'}} DTSTAMP;TZID=Europe/Vienna:{{ event.event_start|date:'Ymd' }}T{{ event.event_start|time:'His' }}
END:VEVENT{% endfor %} END:VEVENT {% endfor %}
END:VCALENDAR END:VCALENDAR