Merge 492dbfe into 1bb3751

GeotrekCE · Jan 16, 2023 · 5982161 · 5982161
2 parents 1bb3751 + 492dbfe
commit 5982161
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -38,6 +38,7 @@ In preparation for HD Views developments (PR #3298)
 - Recreate cache folders if missing. (#3384)
 - Modify site's geometry before saving to avoid edition and export of shapefiles (#3399)
 - Fix API V2 cache key with X-Forwarded-Proto header (#3404)
+- Check pictogram exist on categories during generation of pdfs
 
 
 2.94.0     (2022-12-12)

diff --git a/geotrek/diving/templates/diving/dive_public_pdf_base.html b/geotrek/diving/templates/diving/dive_public_pdf_base.html
@@ -39,7 +39,7 @@
       </header>
       <div class="gray">
         <div>
-          {% if object.practice %}
+          {% if object.practice and object.practice.pictogram %}
             <div class="main-icon category-D{{ object.practice.pk }}" {% block picto_attr %}{% endblock picto_attr %}>
               <img src="file://{{ object.practice.pictogram.path }}" alt="">
             </div>

diff --git a/geotrek/outdoor/templates/outdoor/course_public_pdf_base.html b/geotrek/outdoor/templates/outdoor/course_public_pdf_base.html
@@ -46,7 +46,7 @@
         </div>
       </header>
       <div class="gray">
-        {% if object.parent_sites.first.practice.pictogram %}
+        {% if object.parent_sites.first.practice and object.parent_sites.first.practice.pictogram %}
           <div class="main-icon category-S{{ object.parent_sites.first.practice.pk }}">
             <img src="file://{{ object.parent_sites.first.practice.pictogram.path }}" alt="">
           </div>

diff --git a/geotrek/outdoor/templates/outdoor/site_public_pdf_base.html b/geotrek/outdoor/templates/outdoor/site_public_pdf_base.html
@@ -46,7 +46,7 @@
         </div>
       </header>
       <div class="gray">
-        {% if object.practice.pictogram %}
+        {% if object.practice and object.practice.pictogram %}
           <div class="main-icon category-S{{ object.practice.pk }}" {% block picto_attr %}{% endblock picto_attr %}>
             <img src="file://{{ object.practice.pictogram.path }}" alt="">
           </div>

diff --git a/geotrek/trekking/templates/trekking/trek_public_pdf_base.html b/geotrek/trekking/templates/trekking/trek_public_pdf_base.html
@@ -48,7 +48,7 @@
       </header>
       <div class="gray">
         <div>
-          {% if object.practice %}
+          {% if object.practice and object.practice.pictogram %}
             <div class="main-icon category-T{{ object.practice.pk }}" {% block picto_attr %}{% endblock picto_attr %}>
               <img src="file://{{ object.practice.pictogram.path }}" alt="">
             </div>

diff --git a/geotrek/trekking/tests/test_views.py b/geotrek/trekking/tests/test_views.py
@@ -43,7 +43,7 @@
                         TrekNetworkFactory, WebLinkFactory, AccessibilityFactory,
                         TrekRelationshipFactory, ServiceFactory, ServiceTypeFactory,
                         TrekWithServicesFactory, TrekWithInfrastructuresFactory,
-                        TrekWithSignagesFactory)
+                        TrekWithSignagesFactory, PracticeFactory)
 from ..models import POI, Trek, Service, OrderedTrekChild
 
 
@@ -500,6 +500,19 @@ def test_list_in_csv(self):
             self.assertEqual(row['Cities'], "Trifouilli, Refouilli")
             self.assertEqual(row['Districts'], self.district.name)
 
+    @mock.patch('mapentity.helpers.requests')
+    def test_document_public_export_without_pictogram(self, mock_requests):
+        if self.model is None:
+            return  # Abstract test should not run
+        mock_requests.get.return_value.status_code = 200
+        mock_requests.get.return_value.content = b'<p id="properties">Mock</p>'
+        practice = PracticeFactory.create(pictogram=None)
+        obj = self.modelfactory.create(practice=practice)
+        response = self.client.get(
+            reverse(f'{self.model._meta.app_label}:{self.model._meta.model_name}_printable',
+                    kwargs={'lang': 'en', 'pk': obj.pk, 'slug': obj.slug}))
+        self.assertEqual(response.status_code, 200)
+
 
 class TrekViewsLiveTests(CommonLiveTest):
     model = Trek