mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hopefully a utf8 fix

Browse Source
This commit is contained in:
Michael Götz 2018-01-09 12:52:53 +01:00
parent 0610bae18e
commit 80250d9e6d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ofu_app/apps/food/models.py
View File

@ -10,6 +10,7 @@ from django.contrib.auth.models import User
from django.core.files.uploadedfile import SimpleUploadedFile from django.core.files.uploadedfile import SimpleUploadedFile
from django.db import models from django.db import models
from django.utils import timezone from django.utils import timezone
from django.utils.encoding import smart_text
MAX_LENGTH = 60 MAX_LENGTH = 60
@ -59,6 +60,7 @@ class HappyHour(models.Model):
description = models.CharField(max_length=MAX_LENGTH) description = models.CharField(max_length=MAX_LENGTH)
class Meta: class Meta:
# TODO: unique description instead of date
unique_together = ('date', 'location', 'starttime', 'endtime') unique_together = ('date', 'location', 'starttime', 'endtime')
def __str__(self): def __str__(self):
@ -104,9 +106,10 @@ class UserFoodImage(models.Model):
suf = SimpleUploadedFile(os.path.split(self.image.name)[-1], suf = SimpleUploadedFile(os.path.split(self.image.name)[-1],
temp_handle.read(), temp_handle.read(),
content_type='image/jpg') content_type='image/jpg')
self.thumb.save('%s_%s_thumbnail.%s' % (self.food.name, self.user.username, 'jpg'), suf, save=False) str_food = smart_text(self.food.name, encoding='utf-8')
self.thumb.save('%s_%s_thumbnail.%s' % (str_food, self.user.username, 'jpg'), suf, save=False)
# save the image object # save the image object
self.image.name = "%s_%s_original.%s" % (self.food.name, self.user.username, 'jpg') self.image.name = "%s_%s_original.%s" % (str_food, self.user.username, 'jpg')
super(UserFoodImage, self).save(force_update, force_insert) super(UserFoodImage, self).save(force_update, force_insert)
def delete(self, using=None, keep_parents=False): def delete(self, using=None, keep_parents=False):