Commit a0cccfb0 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

ras and rds will always be listed first on floor pages

parent 857b380d
...@@ -79,10 +79,17 @@ class DetailFloor(LoginRequiredMixin, DetailView): ...@@ -79,10 +79,17 @@ class DetailFloor(LoginRequiredMixin, DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(DetailFloor, self).get_context_data(**kwargs) context = super(DetailFloor, self).get_context_data(**kwargs)
requesting_student = Student.objects.get(user=self.request.user) requesting_student = self.request.user.student
students = Student.objects.visible(requesting_student, self.get_object()) students = Student.objects.visible(requesting_student, self.get_object())
# list RAs first
staff = [student
for student in students
if student.is_staff()]
for s in staff:
students.insert(0, students.pop(students.index(s)))
context['students'] = shadowbanning(requesting_student, students) context['students'] = shadowbanning(requesting_student, students)
# boolean values; helps cut down on if/else block complexity on the template # boolean values; helps cut down on if/else block complexity on the template
context['notOnFloor'] = not(requesting_student in self.get_object()) context['notOnFloor'] = not(requesting_student in self.get_object())
...@@ -113,7 +120,7 @@ class DetailRoom(LoginRequiredMixin, DetailView): ...@@ -113,7 +120,7 @@ class DetailRoom(LoginRequiredMixin, DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(DetailRoom, self).get_context_data(**kwargs) context = super(DetailRoom, self).get_context_data(**kwargs)
requesting_student = Student.objects.get(user=self.request.user) requesting_student = self.request.user.student
students = Student.objects.visible(requesting_student, self.get_object()) students = Student.objects.visible(requesting_student, self.get_object())
......
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