diff --git a/.gitignore b/.gitignore index 006fb29..922d706 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,21 @@ -*/migrations/ media/agencymain/* +!media/agencymain/default.jpg media/userprofilepics/* +!media/userprofilepics/default.jpg +media/uploadsCK/* +!media/uploadsCK/README.txt + +areas/migrations/* +!areas/migrations/__init__.py + +news/migrations/* +!news/migrations/__init__.py + +standards/migrations/* +!standards/migrations/__init__.py + +tasks/migrations/* +!tasks/migrations/__init__.py + +users/migrations/* +!users/migrations/__init__.py diff --git a/areas/migrations/__init__.py b/areas/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/news/migrations/__init__.py b/news/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/standards/migrations/__init__.py b/standards/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index f537c94..0000000 Binary files a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/tasks/migrations/__pycache__/0002_auto_20191211_2158.cpython-38.pyc b/tasks/migrations/__pycache__/0002_auto_20191211_2158.cpython-38.pyc deleted file mode 100644 index 0f75c54..0000000 Binary files a/tasks/migrations/__pycache__/0002_auto_20191211_2158.cpython-38.pyc and /dev/null differ diff --git a/tasks/migrations/__pycache__/__init__.cpython-38.pyc b/tasks/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index c742e6b..0000000 Binary files a/tasks/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index 88b0a11..4b69a1c 100644 Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/models.py b/users/models.py index b086d59..49bae1d 100644 --- a/users/models.py +++ b/users/models.py @@ -45,8 +45,8 @@ class Agency(models.Model): if self.agencypic and hasattr(self.agencypic, 'url'): return self.agencypic.url else: - return "/media/default.jpg" - + return "/media/agencymain/default.jpg" + ''' Class Profile @@ -119,7 +119,7 @@ class Profile(models.Model): if self.image and hasattr(self.image, 'url'): return self.image.url else: - return "/media/default.jpg" + return "/media/userprofilepics/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/base.html b/users/templates/users/base.html index afe2f0e..1a6f85d 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -226,7 +226,7 @@