Merge remote-tracking branch 'origin/main'

GeneralApp/funcs.py

@@ -39,7 +39,7 @@ def get_inter_http_respose(template_obj, context_Dict, request):
             title = getattr(context_Dict['page'], 'title', None)
             text = getattr(context_Dict['page'], 'description', None)
 
-        if text and title and not request.user.is_anonymous:
-            send_push(user=request.user, title=title, text=text)
+        # if text and title and not request.user.is_anonymous:
+        #     send_push(user=request.user, title=title, text=text)
 
     return HttpResponse(template_obj.render(context_Dict, request))

TWB/urls.py

@@ -14,6 +14,7 @@ urlpatterns = [
     path('i18n/', include('django.conf.urls.i18n')),
 
     path('accounts/signup/', login_View, name='signup'),
+    path('accounts/login/cancelled/', login_View),
 
     path('accounts/', include('allauth.urls')),
     path('accounts/', include('allauth.socialaccount.urls')),