Fixing bugs in image validation

Zambom
1 parent 9daae87c
Showing 3 changed files with 9 additions and 5 deletions Show diff stats
users/forms.py
users/models.py
users/templates/users/profile.html
@@ -12,8 +12,9 @@ class Validation(forms.ModelForm):
 		image = self.cleaned_data.get('image', False)
 		if image:
-			if image._size > self.MAX_UPLOAD_SIZE:
-				raise forms.ValidationError(_("The image is too large. It should have less than 2MB."))
+			if hasattr(image, '_size'):
+				if image._size > self.MAX_UPLOAD_SIZE:
+					raise forms.ValidationError(_("The image is too large. It should have less than 2MB."))
 		return image
@@ -10,8 +10,9 @@ from django.contrib.staticfiles.templatetags.staticfiles import static
 def validate_img_extension(value):
 	valid_formats = ['image/jpeg','image/x-citrix-jpeg','image/png','image/x-citrix-png','image/x-png']
-	if not value.file.content_type in valid_formats:
-		raise ValidationError(_('File not supported.'))
+	if hasattr(value.file, 'content_type'):
+		if not value.file.content_type in valid_formats:
+			raise ValidationError(_('File not supported.'))
 class User(AbstractBaseUser, PermissionsMixin):
@@ -54,10 +54,12 @@
 						</div>
 					</div>
 				</div>
+				<br clear="all" />
+				<hr />
 				<div class="row-fluid">
 					<label class="control-form">{% trans 'Description' %}:</label>
 					<div class="col-md-12">
-						{{ user.description|default:_("Not Informed")|linebreaks }}
+						{{ user.description|default:_("Not Informed") }}
 					</div>
 				</div>
 			</div>