Merge branch 'develop' – Pending users Admin fixes

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.501
+
+### Added
+ - Remove/replace items in Membership Coordination
+ - Rename Strategic Priorities in NS Strategic Priorities table
+ - Use AppealHistory
+ - SituationReport – get_for fix
+ - N+1 fix for SituationReportViewset
+ - Sync Molnix at every 15th minute
+ - Increase memory for long-run sync-molnix
+ - All Molnix positions instead of only /open
+ - No rich text in FR summary and in society names
+ - Fix duplicate stats generation in country page
+ - Manual flake8 issues fix
+ - Run black and isort
+ - Change country_plan sector
+ - Appealdocument reader fix
+ - Fix boundary box and centroid map edit
+ - Fix Token Admin page
+ - Fix TinyMCE
+ - Use BaseAppealnumber instead of Appealnumber in appealdoc sync
+
 ## 1.1.500
 
 ### Added
@@ -2449,7 +2471,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.500...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.501...HEAD
+[1.1.501]: https://github.com/IFRCGo/go-api/compare/1.1.500...1.1.501
 [1.1.500]: https://github.com/IFRCGo/go-api/compare/1.1.499...1.1.500
 [1.1.499]: https://github.com/IFRCGo/go-api/compare/1.1.498...1.1.499
 [1.1.498]: https://github.com/IFRCGo/go-api/compare/1.1.497...1.1.498

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>

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ["celery_app"]
-__version__ = "1.1.500"
+__version__ = "1.1.501"

registrations/admin.py

@@ -2,6 +2,7 @@
 from django.contrib import admin
 from django.http import HttpResponseRedirect
 from django.template.loader import render_to_string
+from django_admin_listfilter_dropdown.filters import RelatedDropdownFilter
 from reversion_compare.admin import CompareVersionAdmin
 
 import registrations.models as models
@@ -22,11 +23,16 @@ 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")
     actions = ("activate_users",)
-    list_filter = ["email_verified"]
+    list_filter = (
+        "email_verified",
+        ("user__profile__country__region", RelatedDropdownFilter),
+        ("user__profile__country", RelatedDropdownFilter),
+    )
 
     change_form_template = "admin/pending_change_form.html"
     change_list_template = "admin/pending_change_list.html"
@@ -146,6 +152,20 @@ 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):
+        extra_context = {
+            "show_approve_user": True,
+            "show_save": False,
+            "show_save_and_add_another": False,
+            "show_save_and_continue": False,
+        }
+        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