SS-643 Users can edit their account details

common/urls.py

@@ -1,6 +1,4 @@
 from django.contrib.auth import views as auth_views
-
-# from django.contrib.auth.decorators import login_required
 from django.urls import include, path
 
 from . import views
@@ -11,6 +9,5 @@
     path("success/", views.RegistrationCompleteView.as_view(), name="success"),
     path("signup/", views.SignUpView.as_view(), name="signup"),
     path("verify/", views.VerifyView.as_view(), name="verify"),
-    # path("edit-profile/", login_required(views.EditProfileView.as_view()), name="edit-profile"),
     path("edit-profile/", views.EditProfileView.as_view(), name="edit-profile"),
 ]

common/views.py

@@ -1,8 +1,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import authenticate, login, logout
-
-# from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import send_mail
 from django.db import transaction
@@ -146,7 +145,7 @@ def post(self, request, *args, **kwargs):
         return render(request, self.template_name, {"form": form})
 
 
-# @method_decorator(login_required, name="post")
+@method_decorator(login_required, name="dispatch")
 class EditProfileView(TemplateView):
     template_name = "user/profile_edit_form.html"
 
@@ -170,72 +169,48 @@ def get_user_profile_info(self, request):
 
     def get(self, request, *args, **kwargs):
         user_profile_data = self.get_user_profile_info(request)
+        common_user = True if not request.user.is_superuser else False
 
         profile_edit_form = self.profile_edit_form_class(
-            initial={"affiliation": user_profile_data.affiliation, "department": user_profile_data.department}
+            initial={
+                "affiliation": user_profile_data.affiliation if common_user else "uu",
+                "department": user_profile_data.department if common_user else "",
+            }
         )
 
         user_edit_form = self.user_edit_form_class(
             initial={
-                "email": user_profile_data.user.email,
-                "first_name": user_profile_data.user.first_name,
-                "last_name": user_profile_data.user.last_name,
+                "email": user_profile_data.user.email if common_user else "[email protected]",
+                "first_name": user_profile_data.user.first_name if common_user else "admin_first_name",
+                "last_name": user_profile_data.user.last_name if common_user else "admin_last_name",
             }
         )
 
         return render(request, self.template_name, {"form": user_edit_form, "profile_form": profile_edit_form})
 
     def post(self, request, *args, **kwargs):
         user_profile_data = self.get_user_profile_info(request)
+        common_user = True if not request.user.is_superuser else False
 
         user_form_details = self.user_edit_form_class(
             request.POST,
             instance=request.user,
             initial={
-                "email": user_profile_data.user.email,
+                "email": user_profile_data.user.email if common_user else "[email protected]",
             },
         )
 
         profile_form_details = self.profile_edit_form_class(
             request.POST,
             instance=user_profile_data,
             initial={
-                "affiliation": user_profile_data.affiliation,
+                "affiliation": user_profile_data.affiliation if common_user else "uu",
             },
         )
 
         if user_form_details.is_valid() and profile_form_details.is_valid():
             try:
                 with transaction.atomic():
-                    """
-                    # If we only want to save the new information,
-                    #rather overriding existing one in the database
-                    user_form_retrived_data = user_form_details.save(commit=False)
-
-                    # Only saving the new values, overwriting other existing values
-                    if (
-                        user_form_retrived_data.first_name != user_profile_data.user.first_name
-                        or user_form_retrived_data.last_name != user_profile_data.user.last_name
-                    ):
-                        user_form_retrived_data.username = user_profile_data.user.username
-                        user_form_retrived_data.email = user_profile_data.user.email
-                        user_form_retrived_data.password1 = user_profile_data.user.password
-                        user_form_retrived_data.password2 = user_profile_data.user.password
-                        user_form_retrived_data.save()
-
-                    else:
-                        logger.info("Not saving user form info as nothing has changed", exc_info=True)
-
-                    profile_form_retrived_data = profile_form_details.save(commit=False)
-
-                    # Only saving the new values, overwriting other existing values
-                    profile_form_retrived_data.affiliation = user_profile_data.affiliation
-                    profile_form_retrived_data.deleted_on = user_profile_data.deleted_on
-                    profile_form_retrived_data.why_account_needed = user_profile_data.why_account_needed
-                    profile_form_retrived_data.save()
-
-                    # profile_form_details.save_m2m()
-                    """
                     user_form_details.save()
                     profile_form_details.save()
 
@@ -244,7 +219,9 @@ def post(self, request, *args, **kwargs):
                     logger.info("Updated Department: " + str(self.get_user_profile_info(request).department))
 
             except Exception as e:
-                return HttpResponse("Error updating records: " + str(e))
+                # For the superuser it is expected to not to be able to update records
+                # as it does not have a user profile object.
+                return HttpResponse("Superuser: " + str(not common_user) + ", Error updating records: " + str(e))
 
             return render(request, "user/profile.html", {"user_profile": self.get_user_profile_info(request)})