fixes aldryn configuration and an error in the link config

django-cms · Sep 8, 2016 · 4fedbbe · 4fedbbe
1 parent 9590c46
commit 4fedbbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/aldryn_config.py b/aldryn_config.py
@@ -15,7 +15,7 @@ class Form(forms.BaseForm):
         'List of alignment types, default "left, center, right" (comma separated)',
         required=False,
     )
-    ratio = forms.NumberField(
+    ratio = forms.CharField(
         'The ratio used to calculate the missing width or height, default "1.618"',
         required=False,
     )
@@ -52,7 +52,7 @@ def to_settings(self, data, settings):
                 for item in split_and_strip(data['alignment'])
             ]
         if data['ratio']:
-            settings['DJANGOCMS_PICTURE_RATIO'] = data['ratio']
+            settings['DJANGOCMS_PICTURE_RATIO'] = float(data['ratio'])
         if data['nesting']:
             settings['DJANGOCMS_PICTURE_NESTING'] = data['nesting']
 

diff --git a/djangocms_picture/models.py b/djangocms_picture/models.py
@@ -240,7 +240,7 @@ def get_link(self):
 
     def clean(self):
         # there can be only one link type
-        if self.link_page_id and self.link_page:
+        if self.link_url and self.link_page_id:
             raise ValidationError(
                 ugettext('You have given both external and internal links. '
                          'Only one option is allowed.')