From 77877fbab5b90255676857a5e4f50e510564e1ee Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 30 Oct 2020 17:33:27 +0100
Subject: [PATCH] Bug Agenturbild behoben

---
 .../templates/dasettings/agency_content.html  |   1 +
 dasettings/views.py                           |  21 ++++++++++++++++--
 media/.DS_Store                               | Bin 6148 -> 6148 bytes
 users/usersforms.py                           |   4 +++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dasettings/templates/dasettings/agency_content.html b/dasettings/templates/dasettings/agency_content.html
index 32502a5..e071fe7 100644
--- a/dasettings/templates/dasettings/agency_content.html
+++ b/dasettings/templates/dasettings/agency_content.html
@@ -10,6 +10,7 @@
     <input type="hidden" name="form_type" value="agencyform">
     <input type="hidden" name="settings_area" value="agency">
     {% csrf_token %}
+    {{formfield.media}}
     <fieldset class="form-group">          
       <!-- FORMS LADEN -->      
       <div class="row">
diff --git a/dasettings/views.py b/dasettings/views.py
index 9e21ff9..90cbaa1 100644
--- a/dasettings/views.py
+++ b/dasettings/views.py
@@ -34,7 +34,7 @@ from django.urls import reverse_lazy
 import re
 import json
 from django.conf import settings # import the settings file
-
+from PIL import Image
 
 def randomString(stringLength=10):
     """Generate a random string of fixed length """
@@ -342,9 +342,26 @@ def SettingsAgency(request, context):
 	if request.POST.get("form_type") == "agencyform":
 		agencyform = AgencyUpdateForm(request.POST, instance=request.user.profile.agency)
 		if agencyform.is_valid():
+
+			agency = request.user.profile.agency
+
 			if 'agencypic' in request.FILES:
 				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)
 			messages.success(request, f'Agenturdaten aktualisiert!')
 			return render(request, 'dasettings/settings.html', context)
diff --git a/media/.DS_Store b/media/.DS_Store
index b744eb71cd2dc342bfa4415cdbf5929017c4bac1..09a1383963a89a542b37c330b21f159930f3b533 100644
GIT binary patch
delta 252
zcmZoMXfc=|#>B!ku~2NHo+2an#(>?7i&&T#xhL~5*)xhx7GM(Pjb}(=NMuN6$Yv;I
zD42YJS)8$TasiXd<OHCK6O$J(HE4)eR~s1`=qQ*P)#@lzTUc7?D43fY*Vb}!h^rdf
zdM4ynR#n&3*3Fpg$t=$}b8-!n#N<Y1MS+}j!{Frn+yVv=U}IASNr>d;ySOCf<R<}z
zIDk0bV%Z@_s6+}@3I2i%WMd{wu4a<lyokAkaWgvyKL^lnn?EvtXP(S2;>f|sz`z8u
KYjcFi8fE}JfIun$

delta 159
zcmZoMXfc=|#>B)qu~2NHo+2aL#(>?7jBJy6SnMaCWD%Xbip8Gs<m6W@4W1I!)yBrA
zIts?d2DLg0)#l~~ItnJnX0^4P9O9~mww?*Ol~vU>wRJNYz<`kvLNo9~X&5zY@+MZx
q&6C+m7&kV2WZKNm!OsD-ezPFQcjn3bB90s&bwIr=n<GTlFarQ$`6K!O

diff --git a/users/usersforms.py b/users/usersforms.py
index b55ae79..f423fbb 100644
--- a/users/usersforms.py
+++ b/users/usersforms.py
@@ -78,6 +78,7 @@ class AgencyUpdateForm(forms.ModelForm):
 	width = forms.FloatField(widget=forms.HiddenInput())
 	height = forms.FloatField(widget=forms.HiddenInput())
 	rotation = forms.FloatField(widget=forms.HiddenInput())
+	
 	class Meta:
 		model = Agency	
 		labels = {	
@@ -94,6 +95,7 @@ class AgencyUpdateForm(forms.ModelForm):
 
 	def save(self):		
 		photo = super(AgencyUpdateForm, self).save()
+		
 		try:
 			x = self.cleaned_data.get('x')
 			y = self.cleaned_data.get('y')
@@ -103,11 +105,11 @@ class AgencyUpdateForm(forms.ModelForm):
 			image = Image.open(photo.agencypic)
 			rotatet_image = image.rotate(rotation, expand=True)
 			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)
 			return photo
 		except:
 			print("no photo")	
+		
 
 
 ######################## USERSPERMFORM LÖSCHEN WEIL IN AGENCYGROUP ################################