entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

map: add int conversion before comparing zoom levels (#86631)
gitea/combo/pipeline/head This commit looks good Details

This commit is contained in:
Yann Weber 2024-02-07 10:38:31 +01:00
parent 7aff4544fc
commit ec57e7c060
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
combo/apps/maps/forms.py
View File

@ -132,9 +132,9 @@ class MapCellEditForm(forms.ModelForm):
def clean(self):
cleaned_data = super().clean()
initial_zoom = cleaned_data.get('initial_zoom')
max_zoom = cleaned_data.get('max_zoom')
min_zoom = cleaned_data.get('min_zoom')
initial_zoom = int(cleaned_data['initial_zoom'])
max_zoom = int(cleaned_data['max_zoom'])
min_zoom = int(cleaned_data['min_zoom'])
if min_zoom > max_zoom:
raise ValidationError(
_('Invalid zoom configuration: minimal zoom must be lower than maximal zoom')

7
tests/test_maps_manager.py
View File

@ -367,3 +367,10 @@ def test_manager_map_edit_zoom_check(app, layer, admin_user):
manager_submit_cell(resp.form, expect_errors=True)
assert resp.status_int == 200
assert 'Invalid zoom configuration: minimal zoom must be lower than maximal zoom' in resp.text
# String comparison problem #86631
resp.form[f'cmaps_map-{cell.pk}-initial_zoom'] = 16
resp.form[f'cmaps_map-{cell.pk}-min_zoom'] = 6
resp.form[f'cmaps_map-{cell.pk}-max_zoom'] = 16
manager_submit_cell(resp.form)
assert resp.status_int == 200