Commit 63ca4da3 authored by Daniel W Bond's avatar Daniel W Bond

silly merge fixes

parents b7a969b2 269eb1bd
......@@ -15,7 +15,7 @@ from randomslugfield import RandomSlugField
from multiselectfield import MultiSelectField
from allauth.socialaccount.models import SocialAccount
# imports from your apps
from housing.models import Room, Floor
from housing.models import Room
class Major(TimeStampedModel):
......
......@@ -25,7 +25,7 @@ class LandingPage(LoginRequiredMixin, TemplateView):
# Create Dictionaries to store Students that meet criteria
context["roomies"] = Student.objects.filter(room=me.room).exclude(user__username=me)
context["floories"] = Student.objects.filter(floor=me.get_floor()).exclude(user__username=me).exclude(room=me.room).order_by('room')
context["floories"] = Student.objects.filter(room__floor=me.get_floor()).exclude(user__username=me).exclude(room=me.room).order_by('room')
context["majormates"] = Student.objects.filter(major=me.major).exclude(user__username=me).order_by('?')[:8]
# Hack to Correctly Display Building plus Floor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment