Merge pull request #3238 from GeotrekCE/fix_attachments_message

Fix error message on attachments from other structures
GeotrekCE · Sep 19, 2022 · 58d7e0b · 58d7e0b
2 parents c6189de + 1696281
commit 58d7e0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -15,6 +15,7 @@ CHANGELOG
 
 - Fix Site creation form is initialized with parent Site
 - Fix memory leak and optimize SQL queries on zoning intersections
+- Fix error message should not be displayed on attachments from the same structure as user
 
 **Maintenance**
 

diff --git a/geotrek/common/templates/common/attachment_list.html b/geotrek/common/templates/common/attachment_list.html
@@ -1,10 +1,13 @@
 {% extends "paperclip/attachment_list.html" %}
 {% load i18n %}
 
+
 {% block info_list_attachments %}
-    <div class="alert alert-warning">
-        {% trans "You are not allowed to modify attachments on this object, this object is not from the same structure." %}
-    </div>
+    {% if not user.profile.structure == object.structure and not perms.authent.can_bypass_structure %}
+        <div class="alert alert-warning">
+            {% trans "You are not allowed to modify attachments on this object, this object is not from the same structure." %}
+        </div>
+    {% endif %}
 {% endblock info_list_attachments %}
 
 {% block permissions_add_attachment %}
@@ -15,4 +18,4 @@
 
 {% block inclusion_attachment_table %}
     {% include "common/attachment_table.html" %}
-{% endblock inclusion_attachment_table %}
+{% endblock inclusion_attachment_table %}
diff --git a/geotrek/common/tests/test_attachments.py b/geotrek/common/tests/test_attachments.py
@@ -10,6 +10,7 @@
 from django.test import TestCase, RequestFactory
 from django.test.utils import override_settings
 from django.urls import reverse
+from geotrek.authent.tests.factories import StructureFactory
 
 from mapentity.tests.factories import SuperUserFactory, UserFactory
 from geotrek.common.models import AccessibilityAttachment, Attachment
@@ -46,7 +47,7 @@ def user_perms(p):
             return {'paperclip.add_attachment': False}.get(p, True)
         cls.user = UserFactory()
         cls.user.has_perm = mock.MagicMock(side_effect=user_perms)
-        cls.object = TrekFactory.create()
+        cls.object = TrekFactory.create(structure=StructureFactory(name="Another structure"))
         call_command('update_permissions_mapentity', verbosity=0)
 
     def createRequest(self):