From 0da81f17ba3eceba019be135a9045fc4dc6ecd6d Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Wed, 25 Oct 2023 15:49:32 +0200
Subject: [PATCH] fix bugs in nominations view
add default case when fellows have no competing interests
remove double triangle for browsers with display list
---
scipost_django/colleges/managers.py | 2 +-
.../templates/colleges/_hx_nomination_details_contents.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scipost_django/colleges/managers.py b/scipost_django/colleges/managers.py
index 6bf061165..5d2e0ef96 100644
--- a/scipost_django/colleges/managers.py
+++ b/scipost_django/colleges/managers.py
@@ -103,7 +103,7 @@ class FellowQuerySet(models.QuerySet):
profile_CI, related_CI = CompetingInterest.objects.filter(
Q(profile=profile) | Q(related_profile=profile)
- ).values_list("profile", "related_profile")
+ ).values_list("profile", "related_profile") or ([], [])
return self.exclude(
contributor__profile__pk__in=profile_CI + related_CI,
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_details_contents.html b/scipost_django/colleges/templates/colleges/_hx_nomination_details_contents.html
index 27a967d38..a49c2ecaf 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_details_contents.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_details_contents.html
@@ -136,7 +136,7 @@
<details
{% if not nomination.invitation or 'edadmin' not in user_roles %}open{% endif %}
class="card mb-3">
- <summary class="card-header list-triangle">Voting Rounds</summary>
+ <summary class="card-header d-block list-triangle">Voting Rounds</summary>
<div class="card-body">
<div hx-get="{% url 'colleges:_hx_nomination_voting_rounds_tab' nomination_id=nomination.id round_id=nomination.latest_voting_round.id|default:0 %}"
hx-trigger="intersect once"></div>
--
GitLab