Browse Source

Showstopper on int type setting validation

Ralfp 12 years ago
parent
commit
027a7cfba9
1 changed files with 3 additions and 4 deletions
  1. 3 4
      misago/settings/models.py

+ 3 - 4
misago/settings/models.py

@@ -45,7 +45,7 @@ class Setting(models.Model):
         if self.type == 'float':
         if self.type == 'float':
             return float(self.value)
             return float(self.value)
         if self.type == 'boolean':
         if self.type == 'boolean':
-            return True if self.value == "1" else False
+            return self.value == "1"
         return self.value
         return self.value
             
             
     def set_value(self, value):
     def set_value(self, value):
@@ -75,10 +75,9 @@ class Setting(models.Model):
                 field_validators.append(validators.MinValueValidator(extra['min']))
                 field_validators.append(validators.MinValueValidator(extra['min']))
         if 'max' in extra:
         if 'max' in extra:
             if self.type == 'string' or self.type == 'array':
             if self.type == 'string' or self.type == 'array':
-                field_validators.append(validators.MinValueValidator(extra['max']))
-            if self.type == 'integer' or self.type == 'float':
                 field_validators.append(validators.MaxLengthValidator(extra['max']))
                 field_validators.append(validators.MaxLengthValidator(extra['max']))
-                
+            if self.type == 'integer' or self.type == 'float':
+                field_validators.append(validators.MaxValueValidator(extra['max']))
         
         
         # Yes-no
         # Yes-no
         if self.input == 'yesno':
         if self.input == 'yesno':