SS-643 Users can edit their account details

common/forms.py

@@ -17,6 +17,8 @@
 from common.models import EmailVerificationTable, UserProfile
 from studio.utils import get_logger
 
+from django.utils.translation import gettext_lazy as _
+
 logger = get_logger(__name__)
 
 
@@ -370,7 +372,7 @@ class Meta:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.data})"
 
-    
+'''
 class ProfileEditForm(BootstrapErrorFormMixin, forms.ModelForm):
     affiliation = forms.ChoiceField(
         widget=forms.Select(attrs={"class": "form-control"}),
@@ -403,4 +405,44 @@ class Meta:
 
     def __repr__(self):
         return f"{self.__class__.__name__}({self.data})"
+''' 
+
+class ProfileEditForm(ProfileForm):
+
+
+    class Meta(ProfileForm.Meta):
+
+        exclude = ["note",
+            "why_account_needed",]
+
+    def __init__(self, *args, **kwargs):
+        super(ProfileEditForm, self).__init__(*args, **kwargs)
+        self.fields["affiliation"].disabled=True
+        #self.fields["affiliation"].required = False
+        self.fields["affiliation"].help_text="Affiliation can not be changed. Please email [email protected] with any questions."
+
+'''   
+class UserEditForm(UserForm):
+
+
+    class Meta(UserForm.Meta):
+
+        exclude = [
+            "username",
+            "password1",
+            "password2",
+        ]
+    def __init__(self, *args, **kwargs):
+        super(UserEditForm, self).__init__(*args, **kwargs)
+        self.fields["email"].disabled=True
+        self.fields["email"].help_text="Email address can not be changed. Please email [email protected] with any questions."
+        del self.fields["password1"]
+        del self.fields["password2"]
+        self.fields["email"].required = False
+'''      
+
+
+
+
+
 

common/views.py

@@ -167,7 +167,9 @@ def get(self, request, *args, **kwargs):
         profile_edit_form = self.profile_edit_form_class(initial={
                                                     "affiliation" : user_profile_data.affiliation,
                                                     "department" : user_profile_data.department
-                                                 }) 
+                                                 })
+
+
         user_edit_form = self.user_edit_form_class(initial={
                                                     "email" : user_profile_data.user.email,
                                                     "first_name" : user_profile_data.user.first_name,
@@ -206,7 +208,9 @@ def post(self, request, *args, **kwargs):
             # was invalid
 
             #print (form.errors)
-            logger.error("Edit user error: " + str(user_form_details.errors), exc_info=True)
-            logger.error("Edit profile error: " + str(profile_form_details.errors), exc_info=True)
+            if user_form_details.is_valid()==False:
+                logger.error("Edit user error: " + str(user_form_details.errors), exc_info=True)
+            if  profile_form_details.is_valid()==False:
+                logger.error("Edit profile error: " + str(profile_form_details.errors), exc_info=True)
 
             return render(request, self.template_name, {"form": user_form_details, "profile_form": profile_form_details})