Skip to content

Commit 2250ada

Browse files
ChatewgneChatewgne
authored
Merge pull request #4135 from GeotrekCE/feat_use_reports_from_admin
✨ [FEAT] Make email optional in Report form (refs #4085)
2 parents 8a367c3 + ae34ff9 commit 2250ada

File tree

17 files changed

+200
-62
lines changed

17 files changed

+200
-62
lines changed

‎docs/changelog.rst

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ CHANGELOG
1010
- ApidaeTrekParser now imports field `membreProprietaire` as the structure
1111
- Exclude deleted areas from OpenAir export (fixes #4140)
1212
- Add filter by creation year and update year to Report list (#4085)
13+
- Make email address optional in `Report` form (#4085)
14+
- Add more information to email received by managers on new `Report` (#4085)
1315

1416
**Documentation**
1517

@@ -20,6 +22,7 @@ CHANGELOG
2022
- Fix view `v_treks` (fixes #4099)
2123
- Prevent trek map screenshot error if type of associated information desk have not pictogram
2224

25+
2326
2.106.0 (2024-05-15)
2427
--------------------
2528

‎docs/install/advanced-configuration.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,9 @@ To initialize Report forms (Geotrek-admin, Geotrek-rando-V2, Geotrek-rando-V3) l
953953
954954
**2 - Suricate Standard**
955955

956-
This mode simply forwards all reports to Suricate, using the Standard API to post reports.
956+
This mode forwards reports to Suricate, using the Standard API to post reports.
957+
958+
Reports are forwarded as long as we enter a value for the `email address` field at creation, otherwise they are kept for internal usage only.
957959

958960
Set your account settings in ``custom.py``:
959961

‎geotrek/feedback/forms.py

+5
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ def __init__(self, *args, **kwargs):
6262
# Store current status
6363
if self.instance.pk:
6464
self.old_status = self.instance.status
65+
if not self.instance.pk and settings.SURICATE_REPORT_ENABLED and not settings.SURICATE_WORKFLOW_ENABLED:
66+
self.fields["email"].help_text = _("Leave this field empty not to forward Report to Suricate")
6567
if settings.SURICATE_WORKFLOW_ENABLED: # On Management or Workflow modes
6668
if self.instance.pk: # On updates
6769
# Hide fields that are handled automatically in these modes
@@ -118,6 +120,9 @@ def __init__(self, *args, **kwargs):
118120
self.old_supervisor = None
119121
self.fields["assigned_user"].widget = HiddenInput()
120122
self.fields["uses_timers"].widget = HiddenInput()
123+
else: # Do not use these fields outside of worflow
124+
self.fields["assigned_user"].widget = HiddenInput()
125+
self.fields["uses_timers"].widget = HiddenInput()
121126

122127
def save(self, *args, **kwargs):
123128
creation = not self.instance.pk

‎geotrek/feedback/locale/de/LC_MESSAGES/django.po

+16-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-05-30 14:03+0000\n"
11+
"POT-Creation-Date: 2024-06-04 08:04+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -27,6 +27,9 @@ msgstr ""
2727
msgid "Update year"
2828
msgstr ""
2929

30+
msgid "Leave this field empty not to forward Report to Suricate"
31+
msgstr ""
32+
3033
msgid "Message for sentinel"
3134
msgstr ""
3235

@@ -113,8 +116,11 @@ msgstr ""
113116
msgid "Add a new feedback"
114117
msgstr ""
115118

116-
#, python-brace-format
117-
msgid "Feedback from {email}"
119+
#, python-format
120+
msgid "Feedback from %(email)s"
121+
msgstr ""
122+
123+
msgid "New feedback"
118124
msgstr ""
119125

120126
msgid "to"
@@ -300,15 +306,21 @@ msgstr ""
300306
msgid "%(email)s has sent a feedback."
301307
msgstr ""
302308

309+
msgid "A new feedback has been sent."
310+
msgstr ""
311+
303312
#, python-format
304313
msgid "Comment : %(comment)s"
305314
msgstr ""
306315

316+
msgid "Trek"
317+
msgstr ""
318+
307319
#, python-format
308320
msgid ""
309321
"\n"
310322
"Lat : %(lat)s / Lon : %(lng)s\n"
311-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
323+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
312324
msgstr ""
313325

314326
msgid "New reports have been imported from Suricate."

‎geotrek/feedback/locale/en/LC_MESSAGES/django.po

+16-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-05-30 14:03+0000\n"
11+
"POT-Creation-Date: 2024-06-04 08:04+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -27,6 +27,9 @@ msgstr ""
2727
msgid "Update year"
2828
msgstr ""
2929

30+
msgid "Leave this field empty not to forward Report to Suricate"
31+
msgstr ""
32+
3033
msgid "Message for sentinel"
3134
msgstr ""
3235

@@ -113,8 +116,11 @@ msgstr ""
113116
msgid "Add a new feedback"
114117
msgstr ""
115118

116-
#, python-brace-format
117-
msgid "Feedback from {email}"
119+
#, python-format
120+
msgid "Feedback from %(email)s"
121+
msgstr ""
122+
123+
msgid "New feedback"
118124
msgstr ""
119125

120126
msgid "to"
@@ -300,15 +306,21 @@ msgstr ""
300306
msgid "%(email)s has sent a feedback."
301307
msgstr ""
302308

309+
msgid "A new feedback has been sent."
310+
msgstr ""
311+
303312
#, python-format
304313
msgid "Comment : %(comment)s"
305314
msgstr ""
306315

316+
msgid "Trek"
317+
msgstr ""
318+
307319
#, python-format
308320
msgid ""
309321
"\n"
310322
"Lat : %(lat)s / Lon : %(lng)s\n"
311-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
323+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
312324
msgstr ""
313325

314326
msgid "New reports have been imported from Suricate."

‎geotrek/feedback/locale/es/LC_MESSAGES/django.po

+16-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-05-30 14:03+0000\n"
11+
"POT-Creation-Date: 2024-06-04 08:04+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -27,6 +27,9 @@ msgstr ""
2727
msgid "Update year"
2828
msgstr ""
2929

30+
msgid "Leave this field empty not to forward Report to Suricate"
31+
msgstr ""
32+
3033
msgid "Message for sentinel"
3134
msgstr ""
3235

@@ -113,8 +116,11 @@ msgstr ""
113116
msgid "Add a new feedback"
114117
msgstr ""
115118

116-
#, python-brace-format
117-
msgid "Feedback from {email}"
119+
#, python-format
120+
msgid "Feedback from %(email)s"
121+
msgstr ""
122+
123+
msgid "New feedback"
118124
msgstr ""
119125

120126
msgid "to"
@@ -300,15 +306,21 @@ msgstr ""
300306
msgid "%(email)s has sent a feedback."
301307
msgstr ""
302308

309+
msgid "A new feedback has been sent."
310+
msgstr ""
311+
303312
#, python-format
304313
msgid "Comment : %(comment)s"
305314
msgstr ""
306315

316+
msgid "Trek"
317+
msgstr ""
318+
307319
#, python-format
308320
msgid ""
309321
"\n"
310322
"Lat : %(lat)s / Lon : %(lng)s\n"
311-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
323+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
312324
msgstr ""
313325

314326
msgid "New reports have been imported from Suricate."

‎geotrek/feedback/locale/fr/LC_MESSAGES/django.po

+20-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2024-05-30 14:03+0000\n"
10+
"POT-Creation-Date: 2024-06-04 08:04+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -26,6 +26,10 @@ msgstr "Année de création"
2626
msgid "Update year"
2727
msgstr "Année de mise à jour"
2828

29+
msgid "Leave this field empty not to forward Report to Suricate"
30+
msgstr ""
31+
"Le signalement ne sera pas transmis à Suricate si ce champ est laissé vide."
32+
2933
msgid "Message for sentinel"
3034
msgstr "Message pour la sentinelle"
3135

@@ -118,9 +122,12 @@ msgstr "Signalements"
118122
msgid "Add a new feedback"
119123
msgstr "Créer un signalement"
120124

121-
#, python-brace-format
122-
msgid "Feedback from {email}"
123-
msgstr "Signalement de {email}"
125+
#, python-format
126+
msgid "Feedback from %(email)s"
127+
msgstr "Signalement de %(email)s"
128+
129+
msgid "New feedback"
130+
msgstr "Nouveau signalement"
124131

125132
msgid "to"
126133
msgstr "à"
@@ -144,7 +151,7 @@ msgid "Paths"
144151
msgstr ""
145152

146153
msgid "Treks"
147-
msgstr ""
154+
msgstr "Itinéraires"
148155

149156
msgid "POIs"
150157
msgstr ""
@@ -311,19 +318,25 @@ msgstr ""
311318
msgid "%(email)s has sent a feedback."
312319
msgstr "%(email)s a signalé un problème."
313320

321+
msgid "A new feedback has been sent."
322+
msgstr "Un problème a été signalé."
323+
314324
#, python-format
315325
msgid "Comment : %(comment)s"
316326
msgstr "Commentaire : %(comment)s"
317327

328+
msgid "Trek"
329+
msgstr "Itinéraire"
330+
318331
#, python-format
319332
msgid ""
320333
"\n"
321334
"Lat : %(lat)s / Lon : %(lng)s\n"
322-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
335+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
323336
msgstr ""
324337
"\n"
325338
"Lat : %(lat)s / Lon : %(lng)s\n"
326-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
339+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
327340

328341
msgid "New reports have been imported from Suricate."
329342
msgstr "De nouveaux signalements ont été importés depuis Suricate."

‎geotrek/feedback/locale/it/LC_MESSAGES/django.po

+16-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-05-30 14:03+0000\n"
11+
"POT-Creation-Date: 2024-06-04 08:04+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -27,6 +27,9 @@ msgstr ""
2727
msgid "Update year"
2828
msgstr ""
2929

30+
msgid "Leave this field empty not to forward Report to Suricate"
31+
msgstr ""
32+
3033
msgid "Message for sentinel"
3134
msgstr ""
3235

@@ -113,8 +116,11 @@ msgstr ""
113116
msgid "Add a new feedback"
114117
msgstr ""
115118

116-
#, python-brace-format
117-
msgid "Feedback from {email}"
119+
#, python-format
120+
msgid "Feedback from %(email)s"
121+
msgstr ""
122+
123+
msgid "New feedback"
118124
msgstr ""
119125

120126
msgid "to"
@@ -300,15 +306,21 @@ msgstr ""
300306
msgid "%(email)s has sent a feedback."
301307
msgstr ""
302308

309+
msgid "A new feedback has been sent."
310+
msgstr ""
311+
303312
#, python-format
304313
msgid "Comment : %(comment)s"
305314
msgstr ""
306315

316+
msgid "Trek"
317+
msgstr ""
318+
307319
#, python-format
308320
msgid ""
309321
"\n"
310322
"Lat : %(lat)s / Lon : %(lng)s\n"
311-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
323+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
312324
msgstr ""
313325

314326
msgid "New reports have been imported from Suricate."

‎geotrek/feedback/locale/nl/LC_MESSAGES/django.po

+16-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-05-30 14:03+0000\n"
11+
"POT-Creation-Date: 2024-06-04 08:04+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -27,6 +27,9 @@ msgstr ""
2727
msgid "Update year"
2828
msgstr ""
2929

30+
msgid "Leave this field empty not to forward Report to Suricate"
31+
msgstr ""
32+
3033
msgid "Message for sentinel"
3134
msgstr ""
3235

@@ -113,8 +116,11 @@ msgstr ""
113116
msgid "Add a new feedback"
114117
msgstr ""
115118

116-
#, python-brace-format
117-
msgid "Feedback from {email}"
119+
#, python-format
120+
msgid "Feedback from %(email)s"
121+
msgstr ""
122+
123+
msgid "New feedback"
118124
msgstr ""
119125

120126
msgid "to"
@@ -300,15 +306,21 @@ msgstr ""
300306
msgid "%(email)s has sent a feedback."
301307
msgstr ""
302308

309+
msgid "A new feedback has been sent."
310+
msgstr ""
311+
303312
#, python-format
304313
msgid "Comment : %(comment)s"
305314
msgstr ""
306315

316+
msgid "Trek"
317+
msgstr ""
318+
307319
#, python-format
308320
msgid ""
309321
"\n"
310322
"Lat : %(lat)s / Lon : %(lng)s\n"
311-
"http://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
323+
"https://www.openstreetmap.org/?mlat=%(lat)s&mlon=%(lng)s\n"
312324
msgstr ""
313325

314326
msgid "New reports have been imported from Suricate."

0 commit comments

Comments
 (0)