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

Fix weekly bug

Browse Source
This commit is contained in:
Michael Götz 2018-01-11 09:22:23 +01:00
parent 80250d9e6d
commit bc0b742305
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,10 +106,11 @@ class UserFoodImage(models.Model):
suf = SimpleUploadedFile(os.path.split(self.image.name)[-1],
temp_handle.read(),
content_type='image/jpg')
# TODO: Fix it
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)
self.thumb.save('%s_thumbnail.%s' % (self.food.id, 'jpg'), suf, save=False)
# save the image object
self.image.name = "%s_%s_original.%s" % (str_food, self.user.username, 'jpg')
self.image.name = "%s_%s_original.%s" % (self.food.id, 'jpg')
super(UserFoodImage, self).save(force_update, force_insert)
def delete(self, using=None, keep_parents=False):

4
ofu_app/apps/food/views.py
View File

@ -17,7 +17,7 @@ from apps.food.models import Menu, HappyHour, SingleFood, UserRating, UserFoodIm
def daily_food(request):
today = datetime.datetime.now()
start_week = today - datetime.timedelta(today.weekday())
end_week = start_week + datetime.timedelta(20)
end_week = start_week + datetime.timedelta(7)
feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last()
austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last()
@ -135,6 +135,8 @@ def pic_upload(request, id):
form = UploadImageForm(request.POST, request.FILES)
if form.is_valid():
try:
food = SingleFood.objects.get(food=id)
food.image.clear
old_user_pic = UserFoodImage.objects.get(user=request.user, food=id)
old_user_pic.delete()