merge

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
 

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

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

fet2020/templates/members/jobs_list.html

@@ -5,7 +5,7 @@
 
     <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>
 
         <div class="grid-x align-bottom">

fet2020/templates/posts/fet_calendar.ics

@@ -22,10 +22,10 @@ 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}}</a>
+DESCRIPTION: {{ request.scheme }}://{{ request.get_host }}{{ event.url }} {{ even.title }}</a>
 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' }}