Bug Agenturbild behoben

This commit is contained in:
holger.trampe 2020-10-30 17:33:27 +01:00
parent ae0f5e40b9
commit 77877fbab5
4 changed files with 23 additions and 3 deletions

View File

@ -10,6 +10,7 @@
<input type="hidden" name="form_type" value="agencyform"> <input type="hidden" name="form_type" value="agencyform">
<input type="hidden" name="settings_area" value="agency"> <input type="hidden" name="settings_area" value="agency">
{% csrf_token %} {% csrf_token %}
{{formfield.media}}
<fieldset class="form-group"> <fieldset class="form-group">
<!-- FORMS LADEN --> <!-- FORMS LADEN -->
<div class="row"> <div class="row">

View File

@ -34,7 +34,7 @@ from django.urls import reverse_lazy
import re import re
import json import json
from django.conf import settings # import the settings file from django.conf import settings # import the settings file
from PIL import Image
def randomString(stringLength=10): def randomString(stringLength=10):
"""Generate a random string of fixed length """ """Generate a random string of fixed length """
@ -342,9 +342,26 @@ def SettingsAgency(request, context):
if request.POST.get("form_type") == "agencyform": if request.POST.get("form_type") == "agencyform":
agencyform = AgencyUpdateForm(request.POST, instance=request.user.profile.agency) agencyform = AgencyUpdateForm(request.POST, instance=request.user.profile.agency)
if agencyform.is_valid(): if agencyform.is_valid():
agency = request.user.profile.agency
if 'agencypic' in request.FILES: if 'agencypic' in request.FILES:
request.user.profile.agency.agencypic = request.FILES['agencypic'] request.user.profile.agency.agencypic = request.FILES['agencypic']
agencyform.save() agencyform.save()
else:
'''
SAVE ONLY AG-DATA
'''
agency.name = agencyform.cleaned_data.get('name')
agency.inhaber = agencyform.cleaned_data.get('inhaber')
agency.agency_email = agencyform.cleaned_data.get('agency_email')
agency.phone = agencyform.cleaned_data.get('phone')
agency.street = agencyform.cleaned_data.get('street')
agency.plz = agencyform.cleaned_data.get('plz')
agency.city = agencyform.cleaned_data.get('city')
agency.save()
#agencyform.save()
context['agencyform'] = AgencyUpdateForm(instance=request.user.profile.agency) context['agencyform'] = AgencyUpdateForm(instance=request.user.profile.agency)
messages.success(request, f'Agenturdaten aktualisiert!') messages.success(request, f'Agenturdaten aktualisiert!')
return render(request, 'dasettings/settings.html', context) return render(request, 'dasettings/settings.html', context)

BIN
media/.DS_Store vendored

Binary file not shown.

View File

@ -78,6 +78,7 @@ class AgencyUpdateForm(forms.ModelForm):
width = forms.FloatField(widget=forms.HiddenInput()) width = forms.FloatField(widget=forms.HiddenInput())
height = forms.FloatField(widget=forms.HiddenInput()) height = forms.FloatField(widget=forms.HiddenInput())
rotation = forms.FloatField(widget=forms.HiddenInput()) rotation = forms.FloatField(widget=forms.HiddenInput())
class Meta: class Meta:
model = Agency model = Agency
labels = { labels = {
@ -94,6 +95,7 @@ class AgencyUpdateForm(forms.ModelForm):
def save(self): def save(self):
photo = super(AgencyUpdateForm, self).save() photo = super(AgencyUpdateForm, self).save()
try: try:
x = self.cleaned_data.get('x') x = self.cleaned_data.get('x')
y = self.cleaned_data.get('y') y = self.cleaned_data.get('y')
@ -103,13 +105,13 @@ class AgencyUpdateForm(forms.ModelForm):
image = Image.open(photo.agencypic) image = Image.open(photo.agencypic)
rotatet_image = image.rotate(rotation, expand=True) rotatet_image = image.rotate(rotation, expand=True)
cropped_image = rotatet_image.crop((x, y, w+x, h+y)) cropped_image = rotatet_image.crop((x, y, w+x, h+y))
#resized_image = cropped_image.resize((w, h), Image.ANTIALIAS)
cropped_image.save(photo.agencypic.path) cropped_image.save(photo.agencypic.path)
return photo return photo
except: except:
print("no photo") print("no photo")
######################## USERSPERMFORM LÖSCHEN WEIL IN AGENCYGROUP ################################ ######################## USERSPERMFORM LÖSCHEN WEIL IN AGENCYGROUP ################################
# PERMISSION USER FORM # PERMISSION USER FORM
class UsersPermForm(forms.Form): class UsersPermForm(forms.Form):