FossilRepo
Fix ticket_detail 500: handle empty username in comment user link
Commit
2a7d4d4ac0f39a7d2b8e97a10996d1ee0fc428fa105513adadfb629420bad2a2
Parent
aa77a00f32ca70c…
2 files changed
+1
-27
+1
-1
+1
-27
| --- fossil/views.py | ||
| +++ fossil/views.py | ||
| @@ -768,51 +768,25 @@ | ||
| 768 | 768 | }, |
| 769 | 769 | ) |
| 770 | 770 | |
| 771 | 771 | |
| 772 | 772 | def ticket_detail(request, slug, ticket_uuid): |
| 773 | - import logging | |
| 774 | - import traceback as tb_mod | |
| 775 | - | |
| 776 | - logger = logging.getLogger("fossil.views") | |
| 777 | - | |
| 778 | - try: | |
| 779 | - return _ticket_detail_inner(request, slug, ticket_uuid) | |
| 780 | - except Exception: | |
| 781 | - logger.exception("ticket_detail 500 for %s/%s", slug, ticket_uuid) | |
| 782 | - with open("/tmp/fossilrepo_ticket_detail_error.log", "a") as f: | |
| 783 | - f.write(f"\n--- {ticket_uuid} ---\n") | |
| 784 | - tb_mod.print_exc(file=f) | |
| 785 | - raise | |
| 786 | - | |
| 787 | - | |
| 788 | -def _ticket_detail_inner(request, slug, ticket_uuid): | |
| 789 | - import logging | |
| 790 | - | |
| 791 | - logger = logging.getLogger("fossil.views") | |
| 792 | - | |
| 793 | 773 | project, fossil_repo, reader = _get_repo_and_reader(slug, request) |
| 794 | 774 | |
| 795 | 775 | with reader: |
| 796 | 776 | ticket = reader.get_ticket_detail(ticket_uuid) |
| 797 | 777 | comments = reader.get_ticket_comments(ticket_uuid) if ticket else [] |
| 798 | 778 | |
| 799 | 779 | if not ticket: |
| 800 | 780 | raise Http404("Ticket not found") |
| 801 | 781 | |
| 802 | - try: | |
| 803 | - body_html = mark_safe(sanitize_html(_render_fossil_content(ticket.body, project_slug=slug))) if ticket.body else "" | |
| 804 | - except Exception: | |
| 805 | - logger.exception("ticket_detail: failed to render body for %s", ticket_uuid) | |
| 806 | - body_html = mark_safe(f"<pre>{ticket.body}</pre>") if ticket.body else "" | |
| 807 | - | |
| 782 | + body_html = mark_safe(sanitize_html(_render_fossil_content(ticket.body, project_slug=slug))) if ticket.body else "" | |
| 808 | 783 | rendered_comments = [] |
| 809 | 784 | for c in comments: |
| 810 | 785 | try: |
| 811 | 786 | comment_html = mark_safe(sanitize_html(_render_fossil_content(c["comment"], project_slug=slug))) |
| 812 | 787 | except Exception: |
| 813 | - logger.exception("ticket_detail: failed to render comment for %s", ticket_uuid) | |
| 814 | 788 | comment_html = mark_safe(f"<pre>{c['comment']}</pre>") |
| 815 | 789 | rendered_comments.append( |
| 816 | 790 | { |
| 817 | 791 | "user": c["user"], |
| 818 | 792 | "timestamp": c["timestamp"], |
| 819 | 793 |
| --- fossil/views.py | |
| +++ fossil/views.py | |
| @@ -768,51 +768,25 @@ | |
| 768 | }, |
| 769 | ) |
| 770 | |
| 771 | |
| 772 | def ticket_detail(request, slug, ticket_uuid): |
| 773 | import logging |
| 774 | import traceback as tb_mod |
| 775 | |
| 776 | logger = logging.getLogger("fossil.views") |
| 777 | |
| 778 | try: |
| 779 | return _ticket_detail_inner(request, slug, ticket_uuid) |
| 780 | except Exception: |
| 781 | logger.exception("ticket_detail 500 for %s/%s", slug, ticket_uuid) |
| 782 | with open("/tmp/fossilrepo_ticket_detail_error.log", "a") as f: |
| 783 | f.write(f"\n--- {ticket_uuid} ---\n") |
| 784 | tb_mod.print_exc(file=f) |
| 785 | raise |
| 786 | |
| 787 | |
| 788 | def _ticket_detail_inner(request, slug, ticket_uuid): |
| 789 | import logging |
| 790 | |
| 791 | logger = logging.getLogger("fossil.views") |
| 792 | |
| 793 | project, fossil_repo, reader = _get_repo_and_reader(slug, request) |
| 794 | |
| 795 | with reader: |
| 796 | ticket = reader.get_ticket_detail(ticket_uuid) |
| 797 | comments = reader.get_ticket_comments(ticket_uuid) if ticket else [] |
| 798 | |
| 799 | if not ticket: |
| 800 | raise Http404("Ticket not found") |
| 801 | |
| 802 | try: |
| 803 | body_html = mark_safe(sanitize_html(_render_fossil_content(ticket.body, project_slug=slug))) if ticket.body else "" |
| 804 | except Exception: |
| 805 | logger.exception("ticket_detail: failed to render body for %s", ticket_uuid) |
| 806 | body_html = mark_safe(f"<pre>{ticket.body}</pre>") if ticket.body else "" |
| 807 | |
| 808 | rendered_comments = [] |
| 809 | for c in comments: |
| 810 | try: |
| 811 | comment_html = mark_safe(sanitize_html(_render_fossil_content(c["comment"], project_slug=slug))) |
| 812 | except Exception: |
| 813 | logger.exception("ticket_detail: failed to render comment for %s", ticket_uuid) |
| 814 | comment_html = mark_safe(f"<pre>{c['comment']}</pre>") |
| 815 | rendered_comments.append( |
| 816 | { |
| 817 | "user": c["user"], |
| 818 | "timestamp": c["timestamp"], |
| 819 |
| --- fossil/views.py | |
| +++ fossil/views.py | |
| @@ -768,51 +768,25 @@ | |
| 768 | }, |
| 769 | ) |
| 770 | |
| 771 | |
| 772 | def ticket_detail(request, slug, ticket_uuid): |
| 773 | project, fossil_repo, reader = _get_repo_and_reader(slug, request) |
| 774 | |
| 775 | with reader: |
| 776 | ticket = reader.get_ticket_detail(ticket_uuid) |
| 777 | comments = reader.get_ticket_comments(ticket_uuid) if ticket else [] |
| 778 | |
| 779 | if not ticket: |
| 780 | raise Http404("Ticket not found") |
| 781 | |
| 782 | body_html = mark_safe(sanitize_html(_render_fossil_content(ticket.body, project_slug=slug))) if ticket.body else "" |
| 783 | rendered_comments = [] |
| 784 | for c in comments: |
| 785 | try: |
| 786 | comment_html = mark_safe(sanitize_html(_render_fossil_content(c["comment"], project_slug=slug))) |
| 787 | except Exception: |
| 788 | comment_html = mark_safe(f"<pre>{c['comment']}</pre>") |
| 789 | rendered_comments.append( |
| 790 | { |
| 791 | "user": c["user"], |
| 792 | "timestamp": c["timestamp"], |
| 793 |
| --- templates/fossil/ticket_detail.html | ||
| +++ templates/fossil/ticket_detail.html | ||
| @@ -80,11 +80,11 @@ | ||
| 80 | 80 | <h3 class="text-sm font-semibold text-gray-300 uppercase tracking-wider mb-3">Comments ({{ comments|length }})</h3> |
| 81 | 81 | <div class="space-y-3"> |
| 82 | 82 | {% for c in comments %} |
| 83 | 83 | <div class="rounded-lg bg-gray-800 border border-gray-700"> |
| 84 | 84 | <div class="px-5 py-3 border-b border-gray-700 flex items-center justify-between"> |
| 85 | - <a href="{% url 'fossil:user_activity' slug=project.slug username=c.user %}" class="text-sm font-medium text-gray-200 hover:text-brand-light">{{ c.user|display_user }}</a> | |
| 85 | + {% if c.user %}<a href="{% url 'fossil:user_activity' slug=project.slug username=c.user %}" class="text-sm font-medium text-gray-200 hover:text-brand-light">{{ c.user|display_user }}</a>{% else %}<span class="text-sm font-medium text-gray-400">system</span>{% endif %} | |
| 86 | 86 | <span class="text-xs text-gray-500">{{ c.timestamp|timesince }} ago</span> |
| 87 | 87 | </div> |
| 88 | 88 | <div class="px-5 py-4"> |
| 89 | 89 | <div class="prose prose-invert prose-gray prose-sm max-w-none"> |
| 90 | 90 | {{ c.html }} |
| 91 | 91 |
| --- templates/fossil/ticket_detail.html | |
| +++ templates/fossil/ticket_detail.html | |
| @@ -80,11 +80,11 @@ | |
| 80 | <h3 class="text-sm font-semibold text-gray-300 uppercase tracking-wider mb-3">Comments ({{ comments|length }})</h3> |
| 81 | <div class="space-y-3"> |
| 82 | {% for c in comments %} |
| 83 | <div class="rounded-lg bg-gray-800 border border-gray-700"> |
| 84 | <div class="px-5 py-3 border-b border-gray-700 flex items-center justify-between"> |
| 85 | <a href="{% url 'fossil:user_activity' slug=project.slug username=c.user %}" class="text-sm font-medium text-gray-200 hover:text-brand-light">{{ c.user|display_user }}</a> |
| 86 | <span class="text-xs text-gray-500">{{ c.timestamp|timesince }} ago</span> |
| 87 | </div> |
| 88 | <div class="px-5 py-4"> |
| 89 | <div class="prose prose-invert prose-gray prose-sm max-w-none"> |
| 90 | {{ c.html }} |
| 91 |
| --- templates/fossil/ticket_detail.html | |
| +++ templates/fossil/ticket_detail.html | |
| @@ -80,11 +80,11 @@ | |
| 80 | <h3 class="text-sm font-semibold text-gray-300 uppercase tracking-wider mb-3">Comments ({{ comments|length }})</h3> |
| 81 | <div class="space-y-3"> |
| 82 | {% for c in comments %} |
| 83 | <div class="rounded-lg bg-gray-800 border border-gray-700"> |
| 84 | <div class="px-5 py-3 border-b border-gray-700 flex items-center justify-between"> |
| 85 | {% if c.user %}<a href="{% url 'fossil:user_activity' slug=project.slug username=c.user %}" class="text-sm font-medium text-gray-200 hover:text-brand-light">{{ c.user|display_user }}</a>{% else %}<span class="text-sm font-medium text-gray-400">system</span>{% endif %} |
| 86 | <span class="text-xs text-gray-500">{{ c.timestamp|timesince }} ago</span> |
| 87 | </div> |
| 88 | <div class="px-5 py-4"> |
| 89 | <div class="prose prose-invert prose-gray prose-sm max-w-none"> |
| 90 | {{ c.html }} |
| 91 |