Merge branch 'dev' into feature/page-accessibilite

zestedesavoir · Oct 21, 2024 · 325d799 · 325d799
2 parents 9142633 + 4fb6d14
commit 325d799
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/templates/member/profile.html b/templates/member/profile.html
@@ -858,6 +858,23 @@ <h3>{% trans 'Sanctions' %}</h3>
                                     {% trans "Confirmer" %}
                                 </button>
                             </form>
+                            {% if provider_to_ban %}
+                                <!-- if the user was banned and he was the first for his mail provider, propose quick access to ban provider -->
+                                <a href="#ban-provider-{{ provider_to_ban.pk }}" class="open-modal tail">
+                                    <p>
+                                        {% trans "Bannir le fournisseur email" %}
+                                    </p>
+                                </a>
+                                <form method="post" action="{% url 'check-new-email-provider' provider_to_ban.pk %}" id="ban-provider-{{ provider_to_ban.pk }}" class="modal modal-flex">
+                                    <p>
+                                        {% blocktrans with provider=provider_to_ban.provider %}
+                                            Bannir le fournisseur email <code>{{ provider }}</code>&nbsp;?
+                                        {% endblocktrans %}
+                                    </p>
+                                    {% csrf_token %}
+                                    <button type="submit" name="ban" class="btn btn-submit">{% trans "Confirmer" %}</button>
+                                </form>
+                            {% endif %}
                             {% endif %}
                         </div>
                         {% endif %}

diff --git a/zds/member/views/profile.py b/zds/member/views/profile.py
@@ -199,7 +199,13 @@ def get_context_data(self, **kwargs):
             context["alerts"] = profile.alerts_on_this_profile.all().order_by("-pubdate")
             context["has_unsolved_alerts"] = profile.alerts_on_this_profile.filter(solved=False).exists()
 
+        if self.request.user.has_perm("user.change_bannedemailprovider"):
+            new_provider = NewEmailProvider.objects.filter(user=usr).first()
+            if new_provider is not None:
+                context["provider_to_ban"] = new_provider
+
         context["summaries"] = self.get_summaries(profile, hide_forum_activity)
+
         return context