Merge pull request #233 from PROCOLLAB-github/dev

Dev

Author: yakser

templates/users/admin/users_change_form.html

@@ -7,13 +7,20 @@
     {{ block.super }}
     <div class="submit-row">
         <input type="button" class="mailing-btn" value="Рассылка" onclick="mailing()"/>
+        <input type="button" class="mailing-btn" value="Подтвердить пользователя" onclick="force_verify()"/>
     </div>
     <script>
         function mailing() {
             {% if object_id %}
                 window.open("{% url 'admin:user_mailing' object_id %}", '_blank').focus()
             {% endif %}
         }
+
+        function force_verify(){
+            {% if object_id %}
+                window.location.replace("{% url 'admin:force_verify' object_id %}", '_blank');
+            {% endif %}
+        }
     </script>
 
 {% endblock %}

users/admin.py

@@ -1,9 +1,10 @@
 from django.conf import settings
 from django.contrib import admin
+from django.shortcuts import redirect
 from django.urls import path
 
 from mailing.views import MailingTemplateRender
-from .helpers import send_verification_completed_email
+from .helpers import send_verification_completed_email, force_verify_user
 from .models import (
     CustomUser,
     UserAchievement,
@@ -157,6 +158,11 @@ def get_urls(self):
                 self.admin_site.admin_view(self.mailing),
                 name="user_mailing",
             ),
+            path(
+                "force_verify/<int:object_id>/",
+                self.admin_site.admin_view(self.force_verify),
+                name="force_verify",
+            ),
         ]
         return custom_urls + default_urls
 
@@ -165,6 +171,11 @@ def mailing(self, request, user_object):
         users = [user]
         return MailingTemplateRender().render_template(request, None, users, None)
 
+    def force_verify(self, request, object_id):
+        user = CustomUser.objects.get(pk=object_id)
+        force_verify_user(user)
+        return redirect("admin:users_customuser_change", object_id)
+
 
 @admin.register(UserAchievement)
 class UserAchievementAdmin(admin.ModelAdmin):