Merge pull request #462 from UCL/feature/37

Amending translation public view
UCL · Aug 6, 2024 · ebd8dc5 · ebd8dc5
2 parents 02f53a7 + 6b0758e
commit ebd8dc5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/src/rard/templates/research/anonymousfragment_detail.html b/src/rard/templates/research/anonymousfragment_detail.html
@@ -116,9 +116,17 @@ <h5>{% trans 'Original Text' %} {{ forloop.counter }}</h5>
         {% include 'research/partials/section/original_text_details.html' with show_concordances=True original_text=original_text can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
 
         <div class='mt-3'>
-        {% for translation in original_text.translation_set.all %}
-            {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
-        {% endfor %}
+        {% if perms.research.change_fragment and has_object_lock %}
+            {% for translation in original_text.translation_set.all %}
+                {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
+            {% endfor %}
+        {% else %}
+            {% for translation in original_text.translation_set.all %}
+                {% if translation.approved %}
+                    {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
+                {% endif %}
+            {% endfor %}
+        {% endif %}
         </div>
 
     </section>

diff --git a/src/rard/templates/research/fragment_detail.html b/src/rard/templates/research/fragment_detail.html
@@ -110,9 +110,17 @@ <h5>{% trans 'Original Text' %} {{ forloop.counter }}</h5>
         {% include 'research/partials/section/original_text_details.html' with show_concordances=True original_text=original_text can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
 
         <div class='mt-3'>
-        {% for translation in original_text.translation_set.all %}
-            {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
-        {% endfor %}
+        {% if perms.research.change_fragment and has_object_lock %}
+            {% for translation in original_text.translation_set.all %}
+                {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
+            {% endfor %}
+        {% else %}
+            {% for translation in original_text.translation_set.all %}
+                {% if translation.approved %}
+                    {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_fragment has_object_lock=has_object_lock %}
+                {% endif %}
+            {% endfor %}
+        {% endif %}
         </div>
 
     </section>

diff --git a/src/rard/templates/research/partials/translation_preview.html b/src/rard/templates/research/partials/translation_preview.html
@@ -2,14 +2,14 @@
 
 {% load i18n humanize %}
 
-<div class="card mb-3 bg-light  {% if translation.approved %}border-success{% endif %}">
+<div class="card mb-3 bg-light  {% if translation.approved and has_object_lock %}border-success{% endif %}">
     <div class="card-body">
         <div class='card-text'>
             <div class='d-flex justify-content-between'>
                 <div class='alphabetum'>
                     {{ translation.translated_text|safe }}
                 </div>
-                {% if translation.approved %}
+                {% if translation.approved and has_object_lock %}
                 <div class='text-success mt-n3'>
                     <small>{% trans 'Approved' %}</small>
                 </div>

diff --git a/src/rard/templates/research/testimonium_detail.html b/src/rard/templates/research/testimonium_detail.html
@@ -97,9 +97,17 @@ <h5>{% trans 'Original Text' %} {{ forloop.counter }}</h5>
 
 
         <div class='mt-3'>
-        {% for translation in original_text.translation_set.all %}
-            {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_testimonium has_object_lock=has_object_lock %}
-        {% endfor %}
+            {% if perms.research.change_testimonium and has_object_lock %}
+            {% for translation in original_text.translation_set.all %}
+                {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_testimonium has_object_lock=has_object_lock %}
+            {% endfor %}
+        {% else %}
+            {% for translation in original_text.translation_set.all %}
+                {% if translation.approved %}
+                    {% include 'research/partials/translation_preview.html' with translation=translation can_edit=perms.research.change_testimonium has_object_lock=has_object_lock %}
+                {% endif %}
+            {% endfor %}
+        {% endif %}
         </div>