DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Zwischencommit und Bilder Test

This commit is contained in:
holger.trampe 2020-05-02 13:56:20 +02:00
parent aefa79ea77
commit 60b0c8987e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud/models.py
View File

@ -8,7 +8,7 @@ from django.conf import settings
def user_directory_path(instance, filename): def user_directory_path(instance, filename):
# file will be uploaded to MEDIA_ROOT/agency_<id>/files/<subdirs>/<filename> # file will be uploaded to MEDIA_ROOT/agency_<id>/files/<subdirs>/<filename>
return settings.MEDIA_URL + 'agencydata/agency_{0}/files/{1}'.format(instance.agency.pk, filename) return settings.MEDIA_ROOT + 'agencydata/agency_{0}/files/{1}'.format(instance.agency.pk, filename)
class Data(models.Model): class Data(models.Model):

12
users/models.py
View File

@ -17,11 +17,11 @@ User._meta.get_field('last_name').blank = False
# PATH FOR AGENCYPIC # PATH FOR AGENCYPIC
def picturepath_agency(instance, filename): def picturepath_agency(instance, filename):
# file will be uploaded to MEDIA_ROOT/agency_<id>/<subdirs>/<filename> # file will be uploaded to MEDIA_ROOT/agency_<id>/<subdirs>/<filename>
return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) return settings.MEDIA_ROOT + 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename)
# PATH FOR PROFILEPICS # PATH FOR PROFILEPICS
def picturepath_user(instance, filename): def picturepath_user(instance, filename):
return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) return settings.MEDIA_ROOT + 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename)
@ -81,7 +81,7 @@ class Agency(models.Model):
plz = models.CharField(default="", max_length=5, blank=True) plz = models.CharField(default="", max_length=5, blank=True)
agency_email = models.EmailField(default="", blank=True) agency_email = models.EmailField(default="", blank=True)
phone = models.CharField(default="", max_length=50, blank=True) phone = models.CharField(default="", max_length=50, blank=True)
agencypic = models.ImageField(default=settings.MEDIA_URL + 'ag_default.jpg', upload_to=picturepath_agency, blank=True) agencypic = models.ImageField(default=settings.MEDIA_ROOT + 'ag_default.jpg', upload_to=picturepath_agency, blank=True)
@ -125,7 +125,7 @@ class Agency(models.Model):
if self.agencypic and hasattr(self.agencypic, 'url'): if self.agencypic and hasattr(self.agencypic, 'url'):
return self.agencypic.url return self.agencypic.url
else: else:
return settings.MEDIA_URL + "ag_default.jpg" return settings.MEDIA_ROOT + "ag_default.jpg"
''' '''
@ -170,7 +170,7 @@ class Profile(models.Model):
func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL) func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL)
# Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht
agency = models.ForeignKey(Agency, on_delete=models.PROTECT) agency = models.ForeignKey(Agency, on_delete=models.PROTECT)
image = models.ImageField(default=settings.MEDIA_URL + 'default.jpg', upload_to=picturepath_user, blank=True) image = models.ImageField(default=settings.MEDIA_ROOT + 'default.jpg', upload_to=picturepath_user, blank=True)
compfunc = models.CharField(max_length=60, blank=True) compfunc = models.CharField(max_length=60, blank=True)
visible = models.BooleanField(default=True) visible = models.BooleanField(default=True)
persnumber = models.CharField(default="", max_length=50, blank=True) persnumber = models.CharField(default="", max_length=50, blank=True)
@ -239,7 +239,7 @@ class Profile(models.Model):
if self.image and hasattr(self.image, 'url'): if self.image and hasattr(self.image, 'url'):
return self.image.url return self.image.url
else: else:
return settings.MEDIA_URL + "default.jpg" return settings.MEDIA_ROOT + "default.jpg"
class UserTime(models.Model): class UserTime(models.Model):