Update behavior on admin entering account

backend/donations/models/main.py

@@ -163,12 +163,6 @@ class Meta:
     def __str__(self):
         return f"{self.name}"
 
-    def save(self, *args, **kwargs):
-        # Force the form_url (which acts as an NGO identifier) to lowercase
-        if self.form_url:
-            self.form_url = self.form_url.lower().strip()
-        return super().save(*args, **kwargs)
-
     def get_full_form_url(self):
         if self.form_url:
             return "https://{}/{}".format(settings.APEX_DOMAIN, self.form_url)

backend/donations/views/account_management.py

@@ -89,6 +89,8 @@ def get(self, request, *args, **kwargs):
 
         # if the user is logged in just redirect
         if request.user.is_authenticated:
+            if request.user.is_superuser:
+                return redirect(reverse("admin-index"))
             return redirect(reverse("contul-meu"))
 
         return render(request, self.template_name, context)

backend/donations/views/my_account.py

@@ -3,8 +3,8 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q, QuerySet
-from django.shortcuts import render
-from django.urls import reverse_lazy
+from django.shortcuts import redirect, render
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 
@@ -67,9 +67,14 @@ class NgoDetailsHandler(AccountHandler):
 
     @method_decorator(login_required(login_url=reverse_lazy("login")))
     def get(self, request, *args, **kwargs):
+        user = request.user
+
+        if user.is_superuser:
+            return redirect(reverse("admin-ngos"))
+
         context = {
-            "user": request.user,
-            "ngo": request.user.ngo if request.user.ngo else None,
+            "user": user,
+            "ngo": user.ngo if user.ngo else None,
             "counties": settings.FORM_COUNTIES,
         }
 
@@ -79,7 +84,12 @@ def get(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         post = request.POST
 
-        ngo: Ngo = request.user.ngo
+        user = request.user
+
+        if user.is_superuser:
+            return redirect(reverse("admin-ngos"))
+
+        ngo: Ngo = user.ngo
 
         is_new_ngo = False
         if not ngo:
@@ -113,12 +123,12 @@ def post(self, request, *args, **kwargs):
         ngo.save()
 
         if is_new_ngo:
-            request.user.ngo = ngo
-            request.user.save()
+            user.ngo = ngo
+            user.save()
 
         context = {
-            "user": request.user,
-            "ngo": request.user.ngo if request.user.ngo else None,
+            "user": user,
+            "ngo": user.ngo if user.ngo else None,
             "counties": settings.FORM_COUNTIES,
         }
 

backend/redirectioneaza/urls.py

@@ -62,12 +62,12 @@
         path("ong/", ForNgoHandler.as_view(), name="ngo"),
         path("pentru-ong-uri/", RedirectView.as_view(pattern_name="ngo", permanent=True)),
         # backup in case of old urls. to be removed
-        path("asociatii/", NgoListHandler.as_view()),
+        path("asociatii/", NgoListHandler.as_view(), name="associations"),
         path("termeni/", TermsHandler.as_view(), name="terms"),
         path("TERMENI/", RedirectView.as_view(pattern_name="terms", permanent=True)),
         path("nota-de-informare/", NoteHandler.as_view(), name="note"),
-        path("politica/", PolicyHandler.as_view()),
-        path("despre/", AboutHandler.as_view()),
+        path("politica/", PolicyHandler.as_view(), name="policy"),
+        path("despre/", AboutHandler.as_view(), name="about"),
         # account management
         path("cont-nou/", SignupHandler.as_view()),
         path("login/", LoginHandler.as_view(), name="login"),
@@ -79,10 +79,10 @@
             VerificationHandler.as_view(),
             name="verification",
         ),
-        path("password/", SetPasswordHandler.as_view()),
+        path("password/", SetPasswordHandler.as_view(), name="password"),
         # my account
         path("contul-meu/", MyAccountHandler.as_view(), name="contul-meu"),
-        path("asociatia/", NgoDetailsHandler.as_view(), name="asociatia"),
+        path("asociatia/", NgoDetailsHandler.as_view(), name="association"),
         path("date-cont/", MyAccountDetailsHandler.as_view(), name="date-contul-meu"),
         # APIs
         path("api/ngo/check-url/<ngo_url>/", CheckNgoUrl.as_view(), name="api-ngo-check-url"),
@@ -96,10 +96,10 @@
         path("api/ngo/form/<ngo_url>/", GetNgoForm.as_view(), name="api-ngo-form-url"),
         path("api/ngo/forms/download/", GetNgoForms.as_view(), name="api-ngo-forms"),
         # Cron routes
-        path("cron/stats/", Stats.as_view()),
-        path("cron/ngos/remove-form/", NgoRemoveForms.as_view(), name="ngo-remove-form"),
-        path("cron/ngos/export/", NgoExport.as_view()),
-        path("cron/export/custom/", CustomExport.as_view()),
+        path("cron/stats/", Stats.as_view(), name="cron-stats"),
+        path("cron/ngos/remove-form/", NgoRemoveForms.as_view(), name="cron-ngo-remove-form"),
+        path("cron/ngos/export/", NgoExport.as_view(), name="cron-ngo-export"),
+        path("cron/export/custom/", CustomExport.as_view(), name="cron-custom-export"),
         #
         # END_OF_TODO
         #