1 files changed, 11 insertions, 0 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 3dffc77c4..c59978730 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -192,6 +192,10 @@ class CustomForm(BSForm):
             except AttributeError:
                 pass
         super().__init__(*args, **kwargs)
+        if hasattr(self, "fields"):
+            self.base_field_keys = self.fields.keys()
+        else:
+            self.base_field_keys = []
         if not self._explicit_ordering:
             self.custom_form_ordering()
 
@@ -1312,6 +1316,13 @@ class QAForm(CustomForm, ManageOldType):
             return
         setattr(item, key[3:], value)
 
+    def _get_organization(self, value):
+        try:
+            value = models.Organization.objects.get(pk=value).cached_label
+        except models.Organization.DoesNotExist:
+            return ""
+        return value
+
     def save(self, items, user):
         for item in items:
             for base_key in self.cleaned_data: