← Back to branch summary

~widelands-dev/widelands-website/django_staticfiles

« back to all changes in this revision

Viewing changes to wlprofile/fields.py

  • Committer: Holger Rapp
  • Date: 2012-09-01 16:11:57 UTC
  • mfrom: (325.1.23 development)
  • Revision ID: sirver@gmx.de-20120901161157-nm7xupfhd2jlpypg
Merged Shevonars amazing work!

Show diffs side-by-side

added added

removed removed

Lines of Context:
wlprofile/fields.py
45
45
 
46
46
    
47
47
    def save_form_data(self, instance, data):
48
 
        if data and self.width and self.height:
49
 
            if instance.avatar:
50
 
                instance.avatar.delete()
51
 
 
52
 
            content = self.resize_image(data.read(), width=self.width, height=self.height)
53
 
            data = SimpleUploadedFile(instance.user.username + ".png", content, data.content_type)
 
48
        if data is not None and data != self.default:
 
49
            if not data:
 
50
                data = self.default
 
51
                if instance.avatar != self.default:
 
52
                        instance.avatar.delete()
 
53
            else:
 
54
                if hasattr(data, 'read') and self.width and self.height:
 
55
                    content = self.resize_image(data.read(), width=self.width, height=self.height)
 
56
                    data = SimpleUploadedFile(instance.user.username + ".png", content, "image/png")
 
57
                    if instance.avatar != self.default:
 
58
                        instance.avatar.delete()
54
59
            super(ExtendedImageField, self).save_form_data(instance, data)
55
60
 
56
61