From 29b2eb78414d0c4a9451f71b0679ee1fe0468280 Mon Sep 17 00:00:00 2001
From: "Szabo, Zoltan" <szabozoltan69@gmail.com>
Date: Fri, 28 Jun 2024 15:40:19 +0200
Subject: [PATCH] Pending users approval from detailed view

---
 api/templates/admin/submit_line.html |  1 +
 registrations/admin.py               | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/api/templates/admin/submit_line.html b/api/templates/admin/submit_line.html
index bf45439fd7..9f7ddc5732 100644
--- a/api/templates/admin/submit_line.html
+++ b/api/templates/admin/submit_line.html
@@ -12,6 +12,7 @@
 {% if show_save_and_next %}<input type="submit" value="{% trans 'Save and view next one' %}" name="_save_next">{% endif %}
 {% if show_save_and_add_another %}<input type="submit" value="{% trans 'Save and add another' %}" name="_addanother">{% endif %}
 {% if show_save_and_continue %}<input type="submit" value="{% if can_change %}{% trans 'Save and continue editing' %}{% else %}{% trans 'Save and view' %}{% endif %}" name="_continue">{% endif %}
+{% if show_approve_user %}<input type="submit" value="{% trans 'Approve user' %}" name="_approve_user">{% endif %}
 {% if show_close %}<a href="{% url opts|admin_urlname:'changelist' %}" class="closelink">{% trans 'Close' %}</a>{% endif %}
 {% endblock %}
 </div>
diff --git a/registrations/admin.py b/registrations/admin.py
index 740e978ea3..e7a6afc5bb 100644
--- a/registrations/admin.py
+++ b/registrations/admin.py
@@ -23,6 +23,7 @@ class PendingAdmin(CompareVersionAdmin):
         "get_phone",
         "justification",
         "created_at",
+        "email_verified",
     )
     search_fields = ("user__username", "user__email", "admin_contact_1", "admin_contact_2")
     list_display = ("get_username_and_mail", "get_region", "get_country", "created_at", "email_verified")
@@ -151,6 +152,18 @@ def response_change(self, request, obj):
             return HttpResponseRedirect(".")
         return super().response_change(request, obj)
 
+    def change_view(self, request, object_id, form_url='', extra_context=None):
+        try:
+            extra_context['show_approve_user'] = True
+        except TypeError:
+            extra_context = {'show_approve_user': True}
+        return self.changeform_view(request, object_id, form_url, extra_context)
+
+    def save_model(self, request, obj, form, change):
+        if '_approve_user' in request.POST:
+            self.activate_users(request, [obj])
+        super().save_model(request, obj, form, change)
+
     def get_actions(self, request):
         actions = super(PendingAdmin, self).get_actions(request)
         return actions