Merge branch 'improvements' into 'master'

Improvements

See merge request animath/si/plateforme-corres2math!10

apps/participation/management/commands/fix_matrix_channels.py

@@ -88,5 +88,7 @@ class Command(BaseCommand):
                                         f"@{admin.matrix_username}:correspondances-maths.fr", 95)
             Matrix.set_room_power_level("#faq:correspondances-maths.fr",
                                         f"@{admin.matrix_username}:correspondances-maths.fr", 95)
+            Matrix.set_room_power_level("#je-cherche-une-equipe:correspondances-maths.fr",
+                                        f"@{admin.matrix_username}:correspondances-maths.fr", 95)
             Matrix.set_room_power_level("#flood:correspondances-maths.fr",
                                         f"@{admin.matrix_username}:correspondances-maths.fr", 95)

apps/participation/models.py

@@ -288,7 +288,7 @@ class Phase(models.Model):
     )
 
     @classmethod
-    def current_phase(cls) -> "Phase":
+    def current_phase(cls):
         """
         Retrieve the current phase of this day
         """

apps/participation/templates/participation/participation_detail.html

@@ -194,14 +194,13 @@
         {% trans "This video platform is not supported yet." as unsupported_platform %}
         {% include "base_modal.html" with modal_id="displayOtherSolution" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.received_participation.solution.as_iframe|default:unsupported_platform %}
     {% endif %}
+{% endif %}
 
-    {% if current_phase.phase_number == 2 %}
+{% if user.registration.participates and current_phase.phase_number == 2 %}
-        {% trans "Add question" as modal_title %}
+    {% trans "Add question" as modal_title %}
-        {% trans "Add" as modal_button %}
+    {% trans "Add" as modal_button %}
-        {% url "participation:add_question" pk=participation.pk as modal_action %}
+    {% url "participation:add_question" pk=participation.pk as modal_action %}
-        {% include "base_modal.html" with modal_id="addQuestion" modal_button_type="success" %}
+    {% include "base_modal.html" with modal_id="addQuestion" modal_button_type="success" %}
-    {% endif %}
-
     {% for question in participation.questions.all %}
         {% with number_str=forloop.counter|stringformat:"d"%}
             {% with modal_id="updateQuestion"|add:number_str %}
@@ -261,29 +260,27 @@
                 });
             {% endif %}
 
-            {% if current_phase.phase_number == 2 %}
+            {% if user.registration.participates and current_phase.phase_number == 2 %}
                 $('button[data-target="#addQuestionModal"]').click(function() {
                     let modalBody = $("#addQuestionModal div.modal-body");
                     if (!modalBody.html().trim())
                         modalBody.load("{% url "participation:add_question" pk=participation.pk %} #form-content");
                 });
-            {% endif %}
 
-            {% for question in participation.questions.all %}
+                {% for question in participation.questions.all %}
-                $('button[data-target="#updateQuestion{{ forloop.counter }}Modal"]').click(function() {
+                    $('button[data-target="#updateQuestion{{ forloop.counter }}Modal"]').click(function() {
-                    let modalBody = $("#updateQuestion{{ forloop.counter }}Modal div.modal-body");
+                        let modalBody = $("#updateQuestion{{ forloop.counter }}Modal div.modal-body");
-                    if (!modalBody.html().trim())
+                        if (!modalBody.html().trim())
-                        modalBody.load("{% url "participation:update_question" pk=question.pk %} #form-content");
+                            modalBody.load("{% url "participation:update_question" pk=question.pk %} #form-content");
-                });
+                    });
 
-                {% if current_phase.phase_number == 2 %}
                     $('button[data-target="#deleteQuestion{{ forloop.counter }}Modal"]').click(function() {
                         let modalBody = $("#deleteQuestion{{ forloop.counter }}Modal div.modal-body");
                         if (!modalBody.html().trim())
                             modalBody.load("{% url "participation:delete_question" pk=question.pk %} #form-content");
                     });
-                {% endif %}
+                {% endfor %}
-            {% endfor %}
+            {% endif %}
 
             $('button[data-target="#uploadSolutionModal"]').click(function() {
                 let modalBody = $("#uploadSolutionModal div.modal-body");

apps/participation/views.py

@@ -477,12 +477,6 @@ class UpdateQuestionView(LoginRequiredMixin, UpdateView):
             return super().dispatch(request, *args, **kwargs)
         raise PermissionDenied
 
-    def form_valid(self, form):
-        if not self.request.user.registration.is_admin and Phase.current_phase().phase_number != 2:
-            form.add_error(None, _("You can update your questions now."))
-            return self.form_invalid(form)
-        return super().form_valid(form)
-
     def get_success_url(self):
         return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,))
 
@@ -505,11 +499,6 @@ class DeleteQuestionView(LoginRequiredMixin, DeleteView):
             return super().dispatch(request, *args, **kwargs)
         raise PermissionDenied
 
-    def delete(self, request, *args, **kwargs):
-        if not request.user.registration.is_admin and Phase.current_phase().phase_number != 2:
-            raise PermissionDenied(_("You can update your questions now."))
-        return super().delete(request, *args, **kwargs)
-
     def get_success_url(self):
         return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,))
 

apps/registration/signals.py

@@ -48,9 +48,9 @@ def invite_to_public_rooms(instance: Registration, created: bool, **_):
     """
     When a user got registered, automatically invite the Matrix user into public rooms.
     """
-    if not created:
+    if created:
         Matrix.invite("#annonces:correspondances-maths.fr", f"@{instance.matrix_username}:correspondances-maths.fr")
         Matrix.invite("#faq:correspondances-maths.fr", f"@{instance.matrix_username}:correspondances-maths.fr")
-        Matrix.invite("#je-cherche-une-equip:correspondances-maths.fr",
+        Matrix.invite("#je-cherche-une-equipe:correspondances-maths.fr",
                       f"@{instance.matrix_username}:correspondances-maths.fr")
         Matrix.invite("#flood:correspondances-maths.fr", f"@{instance.matrix_username}:correspondances-maths.fr")