diff --git a/junction/proposals/dashboard.py b/junction/proposals/dashboard.py index 990d4d46..c9886403 100644 --- a/junction/proposals/dashboard.py +++ b/junction/proposals/dashboard.py @@ -114,6 +114,9 @@ def proposals_dashboard(request, conference_slug): "group_by_section": by_section, "group_by_reviewer_section": by_reviewer, "by_target_audience": by_audience, + "is_proposal_reviewer": permissions.is_proposal_reviewer( + user=request.user, conference=conference + ) } return render(request, "proposals/dashboard.html", ctx) @@ -144,6 +147,7 @@ def reviewer_comments_dashboard(request, conference_slug): proposal__status=ProposalStatus.PUBLIC, proposal__conference=conference, ) + .order_by("proposal") .distinct("proposal") .count() ) @@ -183,6 +187,9 @@ def reviewer_comments_dashboard(request, conference_slug): "conference_reviewers": conference_reviewers, "by_conference": by_conference, "by_section": by_section, + "is_proposal_reviewer": permissions.is_proposal_reviewer( + user=request.user, conference=conference + ) } return render(request, "proposals/reviewers_dashboard.html", ctx) diff --git a/junction/proposals/views.py b/junction/proposals/views.py index ea9789e8..aebf22c2 100644 --- a/junction/proposals/views.py +++ b/junction/proposals/views.py @@ -256,6 +256,11 @@ def detail_proposal(request, conference_slug, slug, hashid=None): "is_reviewer": is_reviewer, "is_section_reviewer": is_section_reviewer, "can_view_feedback": False, + "schedule_item": False, + "reviewers_comments": False, + "reviewers_proposal_comment_form": False, + "reviewers_only_proposal_comment_form": False, + "reviewers_only_comments": False, "can_vote": permissions.is_proposal_voting_allowed(proposal), "public_voting_setting": public_voting_setting_value, } diff --git a/junction/templates/profiles/userprofile.html b/junction/templates/profiles/userprofile.html index dab1bf21..13eef2e1 100644 --- a/junction/templates/profiles/userprofile.html +++ b/junction/templates/profiles/userprofile.html @@ -19,7 +19,7 @@ {% block breadcrumbs %} {{ block.super }} - {% breadcrumb "Dashboard" "/profiles" %} + {% breadcrumb "Dashboard" "profiles:dashboard" %} {% breadcrumb "Profile" "dummy-url" %} {% endblock %} diff --git a/junction/templates/proposals/dashboard.html b/junction/templates/proposals/dashboard.html index 4fb55514..38c0beb7 100644 --- a/junction/templates/proposals/dashboard.html +++ b/junction/templates/proposals/dashboard.html @@ -45,8 +45,8 @@ {{ conference.end_date }} {% if is_proposal_reviewer %} - - Reviewer Dashboard + + Reviewer Comments Dashboard {% endif %} diff --git a/junction/templates/proposals/detail/base.html b/junction/templates/proposals/detail/base.html index 37a92deb..c2920653 100644 --- a/junction/templates/proposals/detail/base.html +++ b/junction/templates/proposals/detail/base.html @@ -25,7 +25,7 @@ {% endblock %} {% block navbar_logo %} - {% if conference.logo %} + {% if proposal.conference.logo %} diff --git a/junction/templates/proposals/detail/comments.html b/junction/templates/proposals/detail/comments.html index ddb02c76..f836bf3e 100644 --- a/junction/templates/proposals/detail/comments.html +++ b/junction/templates/proposals/detail/comments.html @@ -40,7 +40,7 @@
{% if comment.is_spam %}
The comment is marked as spam. - {% if request.user.is_authenticated and request.user == comment.marked_marked_as_spam_by %} + {% if request.user.is_authenticated and request.user == comment.marked_as_spam_by %} Unmark as spam {% endif %}

{% else %}