Merge branch 'staging'

apps/core/forms/gmm.py

@@ -10,7 +10,7 @@
 class FileObjectForm(forms.ModelForm):
     class Meta:
         model = FileObject
-        exclude = ()
+        fields = ["name", "file"]
 
 
 GMMFormSet = inlineformset_factory(

apps/core/forms/photos.py

@@ -10,7 +10,7 @@
 
 
 class PhotoAlbumForm(forms.ModelForm):
-    photos = forms.ImageField(widget=forms.ClearableFileInput(attrs={"multiple": True}), required=False)
+    photos = forms.ImageField(widget=forms.ClearableFileInput(attrs={"allow_multiple_selected": True}), required=False)
 
     class Meta:
         model = PhotoAlbum
@@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs):
 
 
 class PhotoObjectForm(forms.ModelForm):
-    photo = forms.ImageField(widget=forms.ClearableFileInput(attrs={"multiple": True}), required=True)
+    photo = forms.ImageField(widget=forms.ClearableFileInput(attrs={"allow_multiple_selected": True}), required=True)
 
     class Meta:
         model = PhotoObject

apps/core/models/gmm.py

@@ -36,6 +36,9 @@ class FileObject(models.Model):
 
     container = models.ForeignKey(GMM, on_delete=models.CASCADE, related_name="has_files")
 
+    def __str__(self):
+        return "FileObjectGMM: {" + self.name + ", " + str(self.date) + "}"
+
     def save(self, *args, **kwargs):
         user = get_current_user()
         if user and not user.pk:
@@ -44,6 +47,3 @@ def save(self, *args, **kwargs):
             self.created_by = user
         self.modified_by = user
         super(FileObject, self).save(*args, **kwargs)
-
-    def __str__(self):
-        return "FileObjectGMM: {" + self.name + ", " + str(self.date) + "}"

apps/core/models/internal.py

@@ -28,6 +28,9 @@ class InternalDocument(models.Model):
 
     file = models.FileField(null=False, blank=False, upload_to="internal/")
 
+    def __str__(self):
+        return "InternalDocument: {" + self.name + ", " + str(self.modified) + "}"
+
     def save(self, *args, **kwargs):
         user = get_current_user()
         if user and not user.pk:
@@ -36,6 +39,3 @@ def save(self, *args, **kwargs):
             self.created_by = user
         self.modified_by = user
         super(InternalDocument, self).save(*args, **kwargs)
-
-    def __str__(self):
-        return "InternalDocument: {" + self.name + ", " + str(self.modified) + "}"

apps/core/models/news.py

@@ -18,11 +18,8 @@ class News(models.Model):
         User, blank=True, null=True, default=None, on_delete=models.SET_NULL, related_name="author"
     )
 
-    def published(self):
-        if self.publish_date > datetime.date.today():
-            return False
-        else:
-            return True
+    def __str__(self):
+        return "News: {" + self.title + ", " + str(self.publish_date) + "}"
 
     def save(self, *args, **kwargs):
         user = get_current_user()
@@ -33,5 +30,8 @@ def save(self, *args, **kwargs):
     def get_absolute_url(self):
         return reverse("cosmos_core:news-list")
 
-    def __str__(self):
-        return "News: {" + self.title + ", " + str(self.publish_date) + "}"
+    def published(self):
+        if self.publish_date > datetime.date.today():
+            return False
+        else:
+            return True

apps/core/models/photos.py

@@ -7,12 +7,12 @@ class PhotoAlbum(models.Model):
     date = models.DateField()
     album_cover = models.ImageField(upload_to="photos")
 
-    def get_absolute_url(self):
-        return reverse("cosmos_core:photo_album-list")
-
     def __str__(self):
         return "PhotoAlbum: {" + self.title + "}"
 
+    def get_absolute_url(self):
+        return reverse("cosmos_core:photo_album-list")
+
 
 class PhotoObject(models.Model):
     photo = models.ImageField(upload_to="photos")

apps/core/templates/footer.html

@@ -28,6 +28,7 @@ <h4>Useful links</h4>
                     <p>
                         <a href="{% static 'cosmos/pdf/Cosmos_Privacy_Policy.pdf' %}">Privacy Policy</a> <br>
                         <a href="{% url 'cosmos_core:terms' %}">Terms and Conditions</a> <br>
+                        <a href="{% static 'cosmos/pdf/PhotoPolicy.pdf' %}">Photo Policy</a> <br>
                         <a href="https://wiki.cosmostue.nl/">Eindhoven Student Wiki</a> <br>
                         <a href="https://linktr.ee/CosmosAssociation">Linktree</a> <br>
                     </p>

apps/core/templates/terms.html

@@ -9,7 +9,7 @@ <h4>Introduction</h4>
     <p>Welcome to the Cosmos Website.</p>
     <p>
       These Terms of Use govern your use of our website and provide information
-      aboutthe services included therein. When you register for Cosmos or use
+      about the services included therein. When you register for Cosmos or use
       the website, you agree to these terms.
     </p>
     <p>

apps/users/models/board.py

@@ -35,13 +35,13 @@ class Board(models.Model):
         validators=[AspectRatioValidator(1.5)],
     )
 
+    def __str__(self):
+        return f"{self.name}: {self.description}"
+
     @property
     def name(self):
         return self.group.name
 
     @property
     def permissions(self):
         return self.group.permissions
-
-    def __str__(self):
-        return f"{self.name}: {self.description}"

apps/users/models/committee.py

@@ -30,13 +30,13 @@ class Committee(models.Model):
         validators=[FileExtensionValidator(["svg", "jpg", "jpeg", "png"])],
     )
 
+    def __str__(self):
+        return f"{self.name}: {self.description}"
+
     @property
     def name(self):
         return self.group.name
 
     @property
     def permissions(self):
         return self.group.permissions
-
-    def __str__(self):
-        return f"{self.name}: {self.description}"

apps/users/models/institution.py

@@ -13,13 +13,13 @@ class Institution(models.Model):
     class Meta:
         abstract = True
 
+    def __str__(self):
+        return f"{self.username}"
+
     @property
     def username(self):
         return self.profile.user.username
 
-    def __str__(self):
-        return f"{self.username}"
-
 
 class InstitutionTue(Institution):
     department = models.CharField(max_length=100, blank=False, choices=list(zip(TUE_DEPARTMENTS, TUE_DEPARTMENTS)))
@@ -29,6 +29,9 @@ class Meta:
         verbose_name = "Member of TU/e"
         verbose_name_plural = "Members of TU/e"
 
+    def __str__(self):
+        return "Institute - TU/e"
+
 
 class InstitutionFontys(Institution):
     study = models.CharField(max_length=100, blank=False, choices=list(zip(FONTYS_STUDIES, FONTYS_STUDIES)))
@@ -37,6 +40,9 @@ class Meta:
         verbose_name = "Member of Fontys"
         verbose_name_plural = "Members of Fontys"
 
+    def __str__(self):
+        return "Institute - Fontys"
+
 
 @receiver(post_save, sender=Profile)
 def profile_post_save(sender, instance: Profile, created, **kwargs):

apps/users/models/profile.py

@@ -34,6 +34,9 @@ class Profile(models.Model):
         max_length=3, verbose_name="Emails are sent to", default="TUE", choices=NEWSLETTER_RECIPIENTS
     )
 
+    def __str__(self):
+        return f"{self.username}"
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -59,6 +62,3 @@ def institution_name(self):
         elif is_fontys_email(self.username):
             return "fontys"
         return None
-
-    def __str__(self):
-        return f"{self.username}"