Be more robust for comments and deleted users.

seantis · Aug 18, 2024 · 01f45cf · 01f45cf
1 parent a71c92f
commit 01f45cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/privatim/layouts/macros.pt b/src/privatim/layouts/macros.pt
@@ -113,8 +113,8 @@
                         />
                         <div>
                             <h6 class="fw-bold text-primary mb-1">
-                                <a href="${request.route_url('person', id=comment.user.id)}">
-                                        ${comment.user.fullname or comment.user.email}</a>
+                                <a href="${request.route_url('person', id=comment.user.id)}" tal:condition="comment.user">${comment.user.fullname}</a>
+                                <a href="#" tal:condition="not comment.user" i18n:translate="">Deleted User</a>
                             </h6>
                             <p class="text-muted mb-0">
                                     ${layout.format_date(comment.created, 'relative')}
@@ -163,8 +163,8 @@
                             />
                             <div>
                                 <h6 class="fw-bold text-primary mb-1">
-                                    <a href="${request.route_url('person', id=comment.user.id)}">
-                                            ${comment.user.fullname or comment.user.email}</a>
+                                    <a href="${request.route_url('person', id=comment.user.id)}" tal:condition="comment.user">${comment.user.fullname}</a>
+                                    <a href="#" tal:condition="not comment.user" i18n:translate="">Deleted User</a>
                                 </h6>
                                 <p class="text-muted mb-0">
                                         ${layout.format_date(comment.created, 'relative')}

diff --git a/src/privatim/views/templates/search_results.pt b/src/privatim/views/templates/search_results.pt
@@ -66,8 +66,9 @@
                                              height="60"
                                         />
                                         <div>
-                                            <h6 class="fw-bold text-primary mb-1">
-                                                <a href="${request.route_url('person', id=comment.user.id)}">${comment.user.fullname}</a>
+                                            <h6 class="fw-bold text-primary mb-1" >
+                                                <a href="${request.route_url('person', id=comment.user.id)}" tal:condition="comment.user">${comment.user.fullname}</a>
+                                                <a href="#" tal:condition="not comment.user" i18n:translate="">Deleted User</a>
                                             </h6>
                                             <p class="text-muted small mb-0">${layout.format_date(comment.created, 'relative')}</p>
                                         </div>