Merge pull request #77 from HackAssistant/fix

Fixed bug with instances

Author: Casassarnau

app/utils.py

@@ -28,3 +28,7 @@ def wrapper(*args, **kwargs):
 
 def is_installed(app):
     return app in settings.INSTALLED_APPS
+
+
+def is_instance_on_db(instance):
+    return instance is not None and instance._state.db is not None and not instance._state.adding

application/forms/base.py

@@ -7,6 +7,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from app.mixins import BootstrapFormMixin
+from app.utils import is_instance_on_db
 from application.models import Application
 
 
@@ -76,14 +77,14 @@ def __init__(self, *args, **kwargs):
         self.initial.update(self.instance.form_data)
         instance = kwargs.get('instance', None)
         hidden_fields = self.get_hidden_edit_fields()
-        if instance is not None and instance._state.db is not None:  # instance in DB
+        if is_instance_on_db(instance):  # instance in DB
             for hidden_field in hidden_fields:
                 self.fields.get(hidden_field).required = False
 
     def get_bootstrap_field_info(self):
         fields = super().get_bootstrap_field_info()
         instance = getattr(self, 'instance', None)
-        if instance is None or instance._state.db is None:  # instance not in DB
+        if not is_instance_on_db(instance):  # instance not in DB
             policy_fields = self.get_policy_fields()
             fields.update({
                 _('HackUPC Polices'): {

user/forms.py

@@ -10,7 +10,7 @@
 from django.utils.safestring import mark_safe
 
 from app.mixins import BootstrapFormMixin
-from app.utils import get_theme
+from app.utils import get_theme, is_instance_on_db
 from user.models import User
 from django.utils.translation import gettext_lazy as _
 
@@ -160,15 +160,15 @@ class UserProfileForm(BootstrapFormMixin, forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         instance = kwargs.get('instance', None)
-        if instance is not None and instance._state.db is not None:  # instance in DB
+        if is_instance_on_db(instance):  # instance in DB
             email_field = self.fields.get('email')
             email_field.widget.attrs['readonly'] = True
             email_field.help_text = _('This field cannot be modified')
 
     def get_bootstrap_field_info(self):
         info = super().get_bootstrap_field_info()
         instance = getattr(self, 'instance', None)
-        if instance is None or instance._state.db is None:  # instance not in DB
+        if not is_instance_on_db(instance):  # instance not in DB
             fields = info[_('Personal Info')]['fields']
             result = []
             for field in fields:
@@ -183,7 +183,7 @@ def get_bootstrap_field_info(self):
 
     def clean_email(self):
         instance = getattr(self, 'instance', None)
-        if instance is not None and instance._state.db is not None:  # instance in DB
+        if is_instance_on_db(instance):  # instance in DB
             return self.instance.email
         return self.cleaned_data.get('email')