Merge 6e9a30f into 92be496

watchdogpolska · Jul 26, 2021 · d56b7b8 · d56b7b8
2 parents 92be496 + 6e9a30f
commit d56b7b8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/feder/letters/templates/letters/_btn.html b/feder/letters/templates/letters/_btn.html
@@ -2,7 +2,9 @@
 {% if object.is_mass_draft %}
     {% get_obj_perms request.user for object.mass_draft.monitoring as "monitoring_perms" %}
 {% else %}
-    {% get_obj_perms request.user for object.case.monitoring as "monitoring_perms" %}
+    {% if object.case %}
+        {% get_obj_perms request.user for object.case.monitoring as "monitoring_perms" %}
+    {% endif %}
 {% endif %}
 <div class="clearfix">
     <div class="pull-right btn-group">

diff --git a/feder/letters/templates/letters/attachment_base_object.html b/feder/letters/templates/letters/attachment_base_object.html
@@ -62,16 +62,22 @@
     <div class="page-header">
         <h2>
             <i class="fa fa-envelope"></i>
-            {% blocktrans with object=object.letter object_url=object.letter.get_absolute_url author=object.letter.author author_url=object.letter.author.get_absolute_url created=object.created created_natural=object.created|naturaltime %}
+            {% with object=object.letter object_url=object.letter.get_absolute_url author=object.letter.author author_url=object.letter.author.get_absolute_url created=object.created created_natural=object.created|naturaltime %}
                 <a href="{{ object_url }}">{{ object }}</a>
-                <small>by <a href="{{ author_url }}"> {{ author }} </a>
+                <small>
+                    {% trans "by" %}
+                    {% if author %}
+                        <a href="{{ author_url }}">{{ author }}</a>
+                    {% else %}
+                        {% trans "unknown" %}
+                    {% endif %}
                     <time datetime="{{ created }}" title="{{ created_natural }}">{{ created }}</time>
-            {% endblocktrans %}
+            {% endwith %}
             {% if object.letter.case %}
-            {% blocktrans with case=object.letter.case case_url=object.letter.case.get_absolute_url institution=object.letter.case.institution institution=object.letter.case.institution %}
-                in case <a href="{{ case_url }}">{{ case }}</a> with <a
-                        href="{{ institution_url }}">{{ institution }}</a></small>
-            {% endblocktrans %}
+                {% blocktrans with case=object.letter.case case_url=object.letter.case.get_absolute_url institution=object.letter.case.institution institution=object.letter.case.institution %}
+                    in case <a href="{{ case_url }}">{{ case }}</a> with <a
+                            href="{{ institution_url }}">{{ institution }}</a></small>
+                {% endblocktrans %}
             {% endif %}
         </h2>
     </div>