From 9bb4d8bc083f5d46ade78ec60be366ace3a8c974 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 6 Jan 2025 11:27:52 +0000
Subject: [PATCH] .

---
 anatomy/models.py                   |  4 ++++
 anatomy/templates/anatomy/mark.html | 10 +++++-----
 generic/views.py                    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/anatomy/models.py b/anatomy/models.py
index 37823c03..0512444c 100644
--- a/anatomy/models.py
+++ b/anatomy/models.py
@@ -336,6 +336,10 @@ class Answer(models.Model):
         This just mirrors the result from the attached question"""
         return self.question.can_edit(user)
 
+
+    def get_answer_url_safe(self):
+        return urllib.parse.quote(self.answer_compare)
+
     # def get_compare_string(self):
     #     s = self.answer.lower().strip()
     #     s = s.translate(str.maketrans('', '', string.punctuation))
diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 6e38c7bf..4b7a52e0 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -38,22 +38,22 @@
                         {% for answer in user_answers %}
 
                             {% if answer in answer_suggest_incorrect %}
-                                <li><pre><span class="answer incorrect suggest" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer %}">{{ answer }}</span></pre></li>
+                                <li><pre><span class="answer incorrect suggest" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer|urlencode:'' %}">{{ answer }}</span></pre></li>
                             {% else %}
-                                <li><pre><span class="answer not-marked" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer %}">{{ answer }}</span></pre></li>
+                                <li><pre><span class="answer not-marked" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer|urlencode:'' %}">{{ answer }}</span></pre></li>
                             {% endif %}
                         {% endfor %}
                     </ul>
                     Marked:
                     <ul id="marked-answer-list" class="answer-list">
                         {% for answer in correct_answers %}
-                            <li><pre><span class="answer correct" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer %}">{{ answer }}</span></pre></li>
+                            <li><pre><span class="answer correct" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer|urlencode:'' %}">{{ answer }}</span></pre></li>
                         {% endfor %}
                         {% for answer in half_mark_answers %}
-                            <li><pre><span class="answer half-correct" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer %}">{{ answer }}</span></pre></li>
+                            <li><pre><span class="answer half-correct" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer|urlencode:'' %}">{{ answer }}</span></pre></li>
                         {% endfor %}
                         {% for answer in incorrect_answers %}
-                            <li><pre><span class="answer incorrect" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer %}">{{ answer }}</span></pre></li>
+                            <li><pre><span class="answer incorrect" title="{{answer}}" data-answerurl="{% url 'anatomy:question_user_answers_by_compare' question.pk answer|urlencode:'' %}">{{ answer }}</span></pre></li>
                         {% endfor %}
                     </ul>
                     <div class="mark-buttons">
diff --git a/generic/views.py b/generic/views.py
index 3194ae03..29495a3e 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -2654,7 +2654,7 @@ class GenericViewBase:
     @method_decorator(login_required)
     def question_user_answers_by_compare(self, request, pk, answer_compare):
         print(answer_compare)
-        #answer_compare = urllib.parse.unquode(answer_compare)
+        answer_compare = urllib.parse.unquode(answer_compare)
         return self.question_user_answers(request, pk, answer_compare)
 
     @method_decorator(login_required)