diff --git a/cloud/views.py b/cloud/views.py index bbb11a8..dbd3982 100644 --- a/cloud/views.py +++ b/cloud/views.py @@ -323,7 +323,7 @@ def trydownloadfile(request, pk): file = DataFile.objects.get(pk=pk) checkuserrights = checkUserDirRights(request, file.parent, request.user.id) if(checkuserrights): - file_path = os.path.join(settings.MEDIA_URL, file.file.name) + file_path = os.path.join(settings.MEDIA_ROOT, file.file.name) if os.path.exists(file_path): with open(file_path, 'rb') as fh: file_ext = file.name.split(".")[1] diff --git a/users/models.py b/users/models.py index e7725cc..ebda601 100644 --- a/users/models.py +++ b/users/models.py @@ -16,12 +16,12 @@ User._meta.get_field('last_name').blank = False # PATH FOR AGENCYPIC def picturepath_agency(instance, filename): - # file will be uploaded to MEDIA_ROOT/agency_// - return settings.MEDIA_ROOT + 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) + # file will be uploaded to MEDIA_URL/agency_// + return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) # PATH FOR PROFILEPICS def picturepath_user(instance, filename): - return settings.MEDIA_ROOT + 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) + return settings.MEDIA_URL + '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) agency_email = models.EmailField(default="", blank=True) phone = models.CharField(default="", max_length=50, blank=True) - agencypic = models.ImageField(default=settings.MEDIA_ROOT + 'ag_default.jpg', upload_to=picturepath_agency, blank=True) + agencypic = models.ImageField(default=settings.MEDIA_URL + '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'): return self.agencypic.url else: - return settings.MEDIA_ROOT + "ag_default.jpg" + return settings.MEDIA_URL + "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) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht agency = models.ForeignKey(Agency, on_delete=models.PROTECT) - image = models.ImageField(default=settings.MEDIA_ROOT + 'default.jpg', upload_to=picturepath_user, blank=True) + image = models.ImageField(default=settings.MEDIA_URL + 'default.jpg', upload_to=picturepath_user, blank=True) compfunc = models.CharField(max_length=60, blank=True) visible = models.BooleanField(default=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'): return self.image.url else: - return settings.MEDIA_ROOT + "default.jpg" + return settings.MEDIA_URL + "default.jpg" class UserTime(models.Model):