Skip to content

Commit a423211

Browse files
Copilotsubmarcos
andcommitted
Address PR review comments: fix placeholders, remove commented code, fix test structure
Co-authored-by: submarcos <7448208+submarcos@users.noreply.github.com>
1 parent d945b8f commit a423211

8 files changed

Lines changed: 13 additions & 20 deletions

File tree

geotrek/common/mixins/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ class BBoxMixin(models.Model):
505505
envelope = models.GeneratedField(
506506
expression=Envelope(Transform("geom", settings.API_SRID)),
507507
db_persist=True,
508-
output_field=models.GeometryField(),
508+
output_field=models.GeometryField(srid=settings.API_SRID),
509509
)
510510

511511
@property

geotrek/maintenance/filters.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ class InterventionFilterSet(
240240
url="zoning:city-autocomplete",
241241
attrs={
242242
"data-placeholder": _("City"),
243-
#'data-theme': 'bootstrap4'
244243
},
245244
),
246245
)
@@ -251,8 +250,7 @@ class InterventionFilterSet(
251250
widget=autocomplete.ModelSelect2Multiple(
252251
url="zoning:district-autocomplete",
253252
attrs={
254-
"data-placeholder": _("City"),
255-
# 'data-theme': 'bootstrap4'
253+
"data-placeholder": _("District"),
256254
},
257255
),
258256
)
@@ -303,7 +301,6 @@ class ProjectFilterSet(StructureRelatedFilterSet):
303301
url="zoning:city-autocomplete",
304302
attrs={
305303
"data-placeholder": _("City"),
306-
#'data-theme': 'bootstrap4'
307304
},
308305
),
309306
)
@@ -314,8 +311,7 @@ class ProjectFilterSet(StructureRelatedFilterSet):
314311
widget=autocomplete.ModelSelect2Multiple(
315312
url="zoning:district-autocomplete",
316313
attrs={
317-
"data-placeholder": _("City"),
318-
# 'data-theme': 'bootstrap4'
314+
"data-placeholder": _("District"),
319315
},
320316
),
321317
)

geotrek/sensitivity/tests/test_admin.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ def test_returns_empty_queryset_if_no_species(self):
3131
queryset = self.admin.get_queryset(None)
3232
self.assertEqual(queryset.count(), 0)
3333

34+
def test_admin_changelist(self):
35+
admin_user = UserFactory(is_staff=True, is_superuser=True)
36+
self.client.force_login(admin_user)
3437

35-
def test_admin_changelist(self):
36-
admin_user = UserFactory(is_staff=True, is_superuser=True)
37-
self.client.force_login(admin_user)
38-
39-
url = reverse("admin:sensitivity_species_changelist")
40-
response = self.client.get(url)
41-
self.assertEqual(response.status_code, 200)
38+
url = reverse("admin:sensitivity_species_changelist")
39+
response = self.client.get(url)
40+
self.assertEqual(response.status_code, 200)

geotrek/signage/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def geom(self, value):
378378

379379
@property
380380
def signage_display(self):
381-
return f'<img src="{settings.STATIC_URL}images/signage-16.png" title="{_("Signage")}" />'
381+
return f'<img src="{settings.STATIC_URL}images/signage-16.png" title="{_("Signage")}">'
382382

383383
@property
384384
def order_lines(self):

geotrek/templates/mapentity/base_site.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@
9090

9191
{% block extrahead %}
9292
{{ block.super }}
93-
<link rel="stylesheet" type="text/css" href="{% static 'style.css' %}"/>
93+
<link rel="stylesheet" type="text/css" href="{% static 'common/style.css' %}"/>
9494
{% endblock %}

geotrek/zoning/filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ZoningFilterSet(FilterSet):
6666
widget=autocomplete.ModelSelect2Multiple(
6767
url="zoning:district-autocomplete",
6868
attrs={
69-
"data-placeholder": _("City"),
69+
"data-placeholder": _("District"),
7070
},
7171
),
7272
)

geotrek/zoning/forms.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ def __init__(self, *args, **kwargs):
1616
url="zoning:city-autocomplete-bbox",
1717
attrs={
1818
"data-placeholder": _("City"),
19-
#'data-theme': 'bootstrap4'
2019
},
2120
),
2221
required=False,
@@ -29,7 +28,6 @@ def __init__(self, *args, **kwargs):
2928
url="zoning:district-autocomplete-bbox",
3029
attrs={
3130
"data-placeholder": _("District"),
32-
#'data-theme': 'bootstrap4'
3331
},
3432
),
3533
required=False,

geotrek/zoning/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def autocomplete(self, request, *args, **kwargs):
5252
instance = qs.first()
5353
if instance is None:
5454
return Response({})
55-
serializer = self.serializer_autocomplete_class(qs.first())
55+
serializer = self.serializer_autocomplete_class(instance)
5656
data = serializer.data
5757
else:
5858
q = self.request.query_params.get(

0 commit comments

Comments
 (0)