Allow displaying assigned_user field in Report Form via conf if needed (

#4085)
GeotrekCE · Aug 20, 2024 · 0ee2855 · 0ee2855
1 parent 9f59350
commit 0ee2855
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,6 +8,7 @@ CHANGELOG
 **Improvements**
 
 - Allow use of Annotation Categories on annotations other than Points (#4032)"
+- Allow using custom.py to make assigned_user field in Report Form available (#4085)
 
 
 2.109.0     (2024-08-08)

diff --git a/docs/install/advanced-configuration.rst b/docs/install/advanced-configuration.rst
@@ -2600,6 +2600,9 @@ An exhaustive list of form fields hideable in each module.
     HIDDEN_FORM_FIELDS["circulationedge"] = [
         ]
 
+.. note::
+  ``assigned_user`` is hidden by default in ``HIDDEN_FORM_FIELDS["report"]``, it is possible to force it to appear using ``HIDDEN_FORM_FIELDS["report"] = []``.
+
 
 Configure form fields required or needed for review or publication
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/geotrek/feedback/forms.py b/geotrek/feedback/forms.py
@@ -121,7 +121,6 @@ def __init__(self, *args, **kwargs):
                     self.fields["assigned_user"].widget = HiddenInput()
                     self.fields["uses_timers"].widget = HiddenInput()
         else:  # Do not use these fields outside of worflow
-            self.fields["assigned_user"].widget = HiddenInput()
             self.fields["uses_timers"].widget = HiddenInput()
 
     def save(self, *args, **kwargs):

diff --git a/geotrek/feedback/tests/test_suricate_sync.py b/geotrek/feedback/tests/test_suricate_sync.py
@@ -580,7 +580,7 @@ def inner(self, *args, **kwargs):
 def test_for_workflow_mode(test_func):
     def inner(self, *args, **kwargs):
         try:
-            with override_settings(SURICATE_REPORT_ENABLED=True, SURICATE_WORKFLOW_ENABLED=True):
+            with override_settings(SURICATE_REPORT_ENABLED=True, SURICATE_WORKFLOW_ENABLED=True, HIDDEN_FORM_FIELDS={}):
                 test_func(self, *args, **kwargs)
         except AssertionError as e:
             e.args += ("Failed for 'Suricate Workflow' mode",)

diff --git a/geotrek/settings/base.py b/geotrek/settings/base.py
@@ -842,7 +842,7 @@ def api_bbox(bbox, buffer):
 PARSER_RETRY_HTTP_STATUS = [503]
 
 USE_BOOKLET_PDF = False
-HIDDEN_FORM_FIELDS = {}
+HIDDEN_FORM_FIELDS = {'report': ['assigned_user']}
 COLUMNS_LISTS = {}
 ENABLE_JOBS_COSTS_DETAILED_EXPORT = False
 
@@ -925,3 +925,6 @@ def api_bbox(bbox, buffer):
 ]
 LEAFLET_CONFIG['TILES_EXTENT'] = SPATIAL_EXTENT
 LEAFLET_CONFIG['SPATIAL_EXTENT'] = api_bbox(SPATIAL_EXTENT, VIEWPORT_MARGIN)
+
+if SURICATE_WORKFLOW_ENABLED and 'report' in HIDDEN_FORM_FIELDS.keys() and "assigned_user" in HIDDEN_FORM_FIELDS['report']:
+    HIDDEN_FORM_FIELDS['report'].remove("assigned_user")