Fix proposal comment template parameters

Fix userprofile dashboard url

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)

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,
     }

junction/templates/profiles/userprofile.html

@@ -19,7 +19,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <!-- breadcrumb takes 2 mandatory arguments (label & viewname)  -->
-    {% breadcrumb "Dashboard" "/profiles" %}
+    {% breadcrumb "Dashboard" "profiles:dashboard" %}
     {% breadcrumb "Profile" "dummy-url" %}
 {% endblock %}
 

junction/templates/proposals/dashboard.html

@@ -45,8 +45,8 @@
                         <span class="end_date">{{ conference.end_date }}</span>
                     </b>
                     {% if is_proposal_reviewer %}
-                        <a class='btn btn-primary pull-right' href="{% url 'proposal-dashboard' conference.slug %}">
-                            Reviewer Dashboard
+                        <a class='btn btn-primary pull-right' href="{% url 'proposal-reviewers-dashboard' conference.slug %}">
+                            Reviewer Comments Dashboard
                         </a>
                     {% endif %}
                     <span class="status status-{{conference.status}}">

junction/templates/proposals/detail/base.html

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block navbar_logo %}
-    {% if conference.logo %}
+    {% if proposal.conference.logo %}
     <a href="{% url "conference-detail" conference.slug %}">
         <img src="{{ conference.logo.url }}">
     </a>

junction/templates/proposals/detail/comments.html

@@ -40,7 +40,7 @@ <h5 class="text-muted clear-margin vote-count">
         {% if comment.is_spam %}
         <div class="comment-description spam" id="comment-{{comment.id}}">
           <span>The comment is marked as spam.</span>
-          {% 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 %}
           <a href="#" data-url="{{ comment.get_unmark_spam_url }}" class="js-unmark-spam">Unmark as spam</a>
           {% endif %}<br/><br/>
           {% else %}