diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index a8c73fe..de731e2 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -21,9 +21,9 @@ var data = [ { 'id': 'parent', 'role': "", 'name': 'Agentur {{request.user.profile.agency.name}}', 'color': '#71AF17', "imageUrl": ""}, {% for u in agencyuser %} {% if u.profile.parent == u %} - { 'id': '{{u.pk}}' , 'name': "{{u.first_name}} {{u.last_name}}",'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': 'parent', 'color': '#1859B7', "imageUrl": "{{u.profile.image.url}}", 'userid' : '{{u.pk}}' }, + { 'id': '{{u.pk}}' , 'name': "{{u.first_name}} {{u.last_name}}",'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': 'parent', 'color': '#1859B7', "imageUrl": "{{u.profile.image.get_photo_url}}", 'userid' : '{{u.pk}}' }, {% else %} - { 'id': '{{u.pk}}', 'name': "{{u.first_name}} {{u.last_name}}", 'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': '{{u.profile.parent.pk}}', 'color': '#1859B7', "imageUrl": "{{u.profile.image.url }}", 'userid' : '{{u.pk}}'}, + { 'id': '{{u.pk}}', 'name': "{{u.first_name}} {{u.last_name}}", 'role': '{{u.profile.get_func_display}}\n{{u.profile.compfunc}}', 'manager': '{{u.profile.parent.pk}}', 'color': '#1859B7', "imageUrl": "{{u.profile.image.get_photo_url }}", 'userid' : '{{u.pk}}'}, {% endif %} {% endfor %} ]; diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 0e00f10..49cd764 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -48,8 +48,7 @@ {% endfor %} - - + {% for area in areas %} @@ -70,7 +69,6 @@ border-collapse: separate; border-spacing: 25px 0px; } - {% endblock content %} \ No newline at end of file diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index 2e60c8c..2b5eb4c 100644 Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ diff --git a/users/models.py b/users/models.py index ff21a82..55167cf 100644 --- a/users/models.py +++ b/users/models.py @@ -31,7 +31,7 @@ class Agency(models.Model): city = models.CharField(default="", max_length=200, blank=True) email = models.EmailField(default="", blank=True) phone = models.CharField(default="", max_length=20, blank=True) - agencypic = models.ImageField(default='default.jpg', upload_to='agencymain', blank=True) + agencypic = models.ImageField(default='default.jpg', upload_to='agencymain', blank=True, null="default.jpg") def __str__(self): return f'{self.name}' @@ -40,6 +40,13 @@ class Agency(models.Model): def get_absolute_url(self): return reverse('agency-update', kwargs={'pk':self.pk}) + @property + def get_photo_url(self): + if self.agencypic and hasattr(self.agencypic, 'url'): + return self.agencypic.url + else: + return "/media/default.jpg" + ''' Class Profile @@ -77,7 +84,7 @@ class Profile(models.Model): func = models.CharField(choices=agency_task, default="", max_length=50) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht agency = models.ForeignKey(Agency, on_delete=models.PROTECT) - image = models.ImageField(default='default.jpg', upload_to='userprofilepics', blank=True) + image = models.ImageField(default='default.jpg', upload_to='userprofilepics', blank=True, null="default.jpg") compfunc = models.CharField(max_length=60, blank=True) @@ -106,6 +113,12 @@ class Profile(models.Model): img = img.resize((wsize, baseheight), Image.ANTIALIAS) img.save(self.image.path) + @property + def get_photo_url(self): + if self.image and hasattr(self.image, 'url'): + return self.image.url + else: + return "/media/default.jpg" # PERMISSIONS - Über alle Modelle hinweg, in der url.py wird dann die route verhindert! # Im template: if perms.users.PERMISSION diff --git a/users/templates/users/agency.html b/users/templates/users/agency.html index 1ad9404..69be139 100644 --- a/users/templates/users/agency.html +++ b/users/templates/users/agency.html @@ -24,7 +24,7 @@

Agenturbild

- +

{% if perms.users.agency_change %} diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 5957d1e..ab01c67 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -34,7 +34,7 @@
- +
diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html index 8ce322d..f018159 100644 --- a/users/templates/users/profile.html +++ b/users/templates/users/profile.html @@ -3,7 +3,7 @@ {% block content %}
- +
diff --git a/users/templates/users/profile_update.html b/users/templates/users/profile_update.html index 9f7bb8d..3bb49ce 100644 --- a/users/templates/users/profile_update.html +++ b/users/templates/users/profile_update.html @@ -3,7 +3,7 @@ {% block content %}
- +