[FEATURE] Deletion of existing photos, of event by any leader

collectives/forms/event.py

@@ -10,7 +10,7 @@
 from flask import current_app
 from flask_login import current_user
 import sqlalchemy
-from wtforms import SubmitField, SelectField, IntegerField, HiddenField
+from wtforms import SubmitField, SelectField, IntegerField, HiddenField, Field
 from wtforms import FieldList, BooleanField, FormField, RadioField, SelectMultipleField
 from wtforms.validators import DataRequired
 from wtforms_alchemy import ModelForm
@@ -144,6 +144,8 @@ class Meta:
         exclude = ["photo"]
 
     photo_file = FileField(validators=[FileAllowed(photos, "Image only!")])
+    remove_photo = BooleanField("Supprimer la photo existante")
+
     duplicate_event = HiddenField()
     event_type_id = SelectField("Type d'événement", choices=[], coerce=int)
     single_activity_type = SelectField("Activité", choices=[], coerce=int)
@@ -166,16 +168,16 @@ class Meta:
 
     user_group = FormField(UserGroupForm, default=UserGroup)
 
-    source_event = None
-    current_leaders = []
-    main_leader_fields = []
-
     def __init__(self, *args, **kwargs):
         """
         Constructor
         """
         super().__init__(*args, **kwargs)
 
+        self.source_event: Event = None
+        self.current_leaders: List[User] = []
+        self.main_leader_fields: List[Field] = []
+
         # Unique identifier for the editing session
         # Useful to associate to temporary data when creating a new event
         if not self.edit_session_id.data:
@@ -200,6 +202,9 @@ def __init__(self, *args, **kwargs):
 
         self.update_choices()
 
+        if "obj" not in kwargs or not kwargs["obj"].photo:
+            del self.remove_photo
+
         if not self.can_switch_multi_activity_mode():
             self.multi_activities_mode.data = True
 

collectives/models/event/misc.py

@@ -1,5 +1,6 @@
 """Module for misc Event methods which does not fit in another submodule"""
 
+import os
 from typing import List
 from flask_uploads import UploadSet, IMAGES
 from werkzeug.datastructures import FileStorage
@@ -72,6 +73,12 @@ def is_visible_to(self, user: User) -> bool:
         user_activities = user.activities_with_role()
         return any(activity in user_activities for activity in self.activity_types)
 
+    def delete_photo(self):
+        """Remove and dereference an event photo."""
+        if self.photo:
+            os.remove(photos.path(self.photo))
+            self.photo = None
+
     def save_photo(self, file: FileStorage) -> bool:
         """Save event photo from a raw file
 
@@ -86,6 +93,8 @@ def save_photo(self, file: FileStorage) -> bool:
             if not is_valid_image(file.stream):
                 return False
 
+            self.delete_photo()  # remove existing
+
             filename = photos.save(file, name="event-" + str(self.id) + ".")
             self.photo = filename
         return True

collectives/models/event/role.py

@@ -81,19 +81,15 @@ def has_edit_rights(self, user):
             return True
         return self.is_leader(user) or self.is_supervisor(user)
 
-    def has_delete_rights(self, user):
+    def has_delete_rights(self, user: User) -> bool:
         """Check if a user can delete this event.
 
-        Returns true if either:
-         - user supervises any of this event activities
-         - user is moderator
+        Equivalent to :func:`has_edit_rights`
 
         :param user: User which will be tested.
-        :type user: :py:class:`collectives.models.user.User`
         :return: True if user can delete the event.
-        :rtype: boolean
         """
-        return user.is_moderator() or self.is_supervisor(user)
+        return self.has_edit_rights(user)
 
     def can_remove_leader(self, user, leader):
         """

collectives/routes/event.py

@@ -587,6 +587,10 @@ def manage_event(event_id=None):
         for tag in form.tag_list.data:
             event.tag_refs.append(EventTag(tag))
 
+        # delete existing photo if requested
+        if form.remove_photo and form.remove_photo.data:
+            event.delete_photo()
+
         # We have to save new event before add the photo, or id is not defined
         db.session.add(event)
         update_waiting_list(event)

collectives/templates/event/editevent.html

@@ -247,6 +247,10 @@ <h4 class="heading-4">Description</h4>
           <span class="label-help">&#9432; Photo uniquement, d'une taille maximum de 2Mo. Uniquement libre de droit ou dont vous avez les droits.</span>
         </label> 
         {{ form.photo_file(onchange="checkFileFieldSize(this)") }}
+        {%if form.remove_photo %}
+        <div class="inline_field">
+          {{form.remove_photo}} {{form.remove_photo.label}}
+        </div>{% endif %}
     </div>
     <div class="controls">
         <label for="{{form.tag_list.id_for_label}}">Labels:</label>{{ form.tag_list }}