diff --git a/fet2020/fet2020/views.py b/fet2020/fet2020/views.py index 1b75974e..ad3af9ee 100644 --- a/fet2020/fet2020/views.py +++ b/fet2020/fet2020/views.py @@ -17,13 +17,8 @@ def index(request): t = set(t for t in get_tags(posts_for_tags)) # set the pinned post -<<<<<<< HEAD pinned_post = Post.articles.pinned() if pinned_post: -======= - featured_post = Post.articles.get_pinned_article() - if featured_post: ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f # remove the pinned post posts.remove(pinned_post) @@ -32,13 +27,9 @@ def index(request): if not featured_event: featured_event = Event.only_events.past_events().first() -<<<<<<< HEAD featured_meeting = deque([]) featured_meeting.append(FetMeeting.objects.future_events().first()) featured_meeting.append(FetMeeting.objects.past_events().first()) -======= - featured_meeting = deque(FetMeeting.objects.get_meetings()) ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f context = { "posts": deque(list(posts)[:5]), diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 4bc18e13..99a70b35 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -81,15 +81,10 @@ def jobs_view(request, slug=None): def members_view(request, filter=None): pinned_job_groups, unpinned_job_groups = __get_job_groups() -<<<<<<< HEAD for elem in Member.MemberRole: if filter == elem.label.lower(): members = Member.all_members.filter(role=elem.value) break -======= - if filter in Member.MemberRole: - members = Member.all_members.filter(role=filter) ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f else: logger.info("Wrong member role '{}'".format(filter)) raise Http404("no member role") diff --git a/fet2020/posts/managers.py b/fet2020/posts/managers.py index 03748864..da3aee03 100644 --- a/fet2020/posts/managers.py +++ b/fet2020/posts/managers.py @@ -173,20 +173,7 @@ class FetMeetingManager(PublishedManager, Manager): qs = self.published().filter(event_start__gt=date_today) return qs.reverse() -<<<<<<< HEAD def past_events(self): date_today = timezone.now() qs = self.published().filter(event_start__lt=date_today) return qs -======= - def get_meetings(self): - meetings = [] - - if self._get_future_events().first(): - meetings.append(self._get_future_events().first()) - - if self._get_past_events().first(): - meetings.append(self._get_past_events().first()) - - return meetings ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index d46ba1f1..4b1b2316 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -201,13 +201,8 @@ def show(request, id=None): "files": files, "author": author, "author_image": author_image, -<<<<<<< HEAD "next": __next(post, public_only), "previous": __previous(post, public_only), -======= - "next": get_next_dict(p), - "previous": get_previous_dict(p), ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f "related_posts": related_posts[0:6], "ep_agenda_link": ep_agenda_link, "ep_protocol_link": ep_protocol_link, diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index a2d34fdf..1a387e7b 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -40,11 +40,8 @@ -<<<<<<< HEAD {% block galleryheader %} {% endblock %} -======= ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f {% block extraheader %} {% endblock %} @@ -72,13 +69,8 @@ x-transition:leave-end="transform opacity-0 scale-90" >
  • News
    • -<<<<<<< HEAD
  • Fachschaft
  • Galerie
    • -======= -
  • Fachschaft
    • -
  • Fotos
    • ->>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f
  • Blackboard
  • Kontakt
    • @@ -130,7 +122,6 @@