init und migrations gitignore

.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

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

users/templates/users/base.html

@@ -226,7 +226,7 @@
             <li class="nav-item dropdown no-arrow">
               <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{request.user.first_name}} {{request.user.last_name}}</span>
-                <img class="img-profile " src="{{ user.profile.image.url }}">
+                <img class="img-profile " src="{{ user.profile.get_photo_url }}">
               </a>
               <!-- Dropdown - User Information -->
               <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="userDropdown">