diff --git a/colleges/managers.py b/colleges/managers.py index 68078390023288d5545ec5b38fdc368a6b5f74bd..90fb581e369cb8aa905714c53c3c9bb9861f5b9d 100644 --- a/colleges/managers.py +++ b/colleges/managers.py @@ -53,9 +53,7 @@ class FellowQuerySet(models.QuerySet): class PotentialFellowshipQuerySet(models.QuerySet): def vote_needed(self, contributor): - return self.filter(profile__discipline=contributor.profile.discipline, - status=POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING - ).exclude(Q(in_agreement__in=[contributor]) | - Q(in_abstain__in=[contributor]) | - Q(in_disagreement__in=[contributor]) - ).order_by('profile__last_name') + return self.filter( + profile__discipline=contributor.profile.discipline, + status=POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING + ).order_by('profile__last_name') diff --git a/colleges/templates/colleges/potentialfellowship_list.html b/colleges/templates/colleges/potentialfellowship_list.html index 94a2cf7e4bc2d0a0e5e6ac8ee831b4104fe6e480..8ffcb5c9927885748545c7e77e67efa1313f04b7 100644 --- a/colleges/templates/colleges/potentialfellowship_list.html +++ b/colleges/templates/colleges/potentialfellowship_list.html @@ -22,13 +22,13 @@ $(document).ready(function($) { {% if perms.scipost.can_add_potentialfellowship %} <div class="row"> <div class="col-12"> - <h3 class="highlight">Nomination of/voting on potential Fellowships</h3> + <h3 class="highlight">Nominations for/voting on potential Fellowships</h3> <p> Do you know somebody qualified who could serve as a Fellow?<br/> Nominate them by <a href="{% url 'colleges:potential_fellowship_create' %}">adding a Potential Fellowship</a>. </p> {% if potfels_to_vote_on %} - <h4>To vote on:</h4> + <h4>Nominations to vote on:</h4> <ul> {% for potfel in potfels_to_vote_on %} <li>{{ potfel }}</li>