combo/apps/maps/forms.py

@@ -15,13 +15,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
+from django.core.exceptions import ValidationError
 from django.utils.encoding import force_str
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
 from combo.data.fields import TemplatableURLField
 
-from .models import MapLayer, MapLayerOptions
+from .models import Map, MapLayer, MapLayerOptions
 
 
 class IconRadioSelect(forms.RadioSelect):
@@ -122,3 +123,24 @@ class MapLayerOptionsForm(forms.ModelForm):
             self.fields['opacity'].required = True
             self.fields['opacity'].initial = 1
             del self.fields['properties']
+
+
+class MapCellEditForm(forms.ModelForm):
+    class Meta:
+        model = Map
+        fields = ('initial_zoom', 'min_zoom', 'max_zoom')
+
+    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')
+        if min_zoom > max_zoom:
+            raise ValidationError(
+                _('Invalid zoom configuration: minimal zoom must be lower than maximal zoom')
+            )
+        if not (max_zoom >= initial_zoom >= min_zoom):
+            raise ValidationError(
+                _('Invalid zoom configuration: initial zoom is not between minimal & maximal zoom'),
+            )
+        return cleaned_data

combo/apps/maps/models.py

@@ -469,13 +469,15 @@ class Map(CellBase):
         return forms.models.modelform_factory(self.__class__, fields=fields)
 
     def get_manager_tabs(self):
+        from .forms import MapCellEditForm
+
         tabs = super().get_manager_tabs()
         tabs.insert(
             1,
             {
                 'slug': 'zoom',
                 'name': _('Zoom'),
-                'fields': ['initial_zoom', 'min_zoom', 'max_zoom'],
+                'form': MapCellEditForm,
             },
         )
         return tabs

tests/test_maps_manager.py

@@ -321,3 +321,49 @@ def test_manager_maps_cell_tabs(app, admin_user):
 
     assert not resp.pyquery('[data-tab-slug="general"] input[name$="title"]')
     assert resp.pyquery('[data-tab-slug="appearance"] input[name$="title"]')
+
+
+def test_manager_map_edit_zoom_check(app, layer, admin_user):
+    app = login(app)
+    page = Page(title='xxx', slug='test', template_name='standard')
+    page.save()
+    cell = Map(page=page, placeholder='content', order=0, public=True)
+    cell.title = 'TestMap'
+    cell.save()
+
+    resp = app.get(f'/manage/pages/{page.pk}/')
+
+    # Valid zooms
+    resp.form[f'cmaps_map-{cell.pk}-initial_zoom'] = 0
+    resp.form[f'cmaps_map-{cell.pk}-min_zoom'] = 0
+    resp.form[f'cmaps_map-{cell.pk}-max_zoom'] = 0
+    manager_submit_cell(resp.form)
+    assert resp.status_int == 200
+
+    resp.form[f'cmaps_map-{cell.pk}-initial_zoom'] = 6
+    resp.form[f'cmaps_map-{cell.pk}-min_zoom'] = 0
+    resp.form[f'cmaps_map-{cell.pk}-max_zoom'] = 6
+    manager_submit_cell(resp.form)
+    assert resp.status_int == 200
+
+    # Invalid zooms
+    resp.form[f'cmaps_map-{cell.pk}-initial_zoom'] = 0
+    resp.form[f'cmaps_map-{cell.pk}-min_zoom'] = 6
+    resp.form[f'cmaps_map-{cell.pk}-max_zoom'] = 6
+    manager_submit_cell(resp.form, expect_errors=True)
+    assert resp.status_int == 200
+    assert 'Invalid zoom configuration: initial zoom is not between minimal & maximal zoom' in resp.text
+
+    resp.form[f'cmaps_map-{cell.pk}-initial_zoom'] = 6
+    resp.form[f'cmaps_map-{cell.pk}-min_zoom'] = 0
+    resp.form[f'cmaps_map-{cell.pk}-max_zoom'] = 0
+    manager_submit_cell(resp.form, expect_errors=True)
+    assert resp.status_int == 200
+    assert 'Invalid zoom configuration: initial zoom is not between minimal & maximal zoom' in resp.text
+
+    resp.form[f'cmaps_map-{cell.pk}-initial_zoom'] = 6
+    resp.form[f'cmaps_map-{cell.pk}-min_zoom'] = 6
+    resp.form[f'cmaps_map-{cell.pk}-max_zoom'] = 0
+    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