Fix automatic association of general contractor corporation

2 files changed, 7 insertions, 17 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index d64d20a02..b21415d16 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -475,8 +475,13 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem,
            self.general_contractor.attached_to \
            == self.corporation_general_contractor:
             return False
-        self.corporation_general_contractor = \
-            self.general_contractor.attached_to
+        if self.general_contractor.attached_to:
+            self.corporation_general_contractor = \
+                self.general_contractor.attached_to
+        else:
+            self.general_contractor.attached_to = \
+                self.corporation_general_contractor
+            self.general_contractor.save()
         return True
 
     def save(self, *args, **kwargs):
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index 1a260541f..8dbc12024 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -332,21 +332,6 @@ class FileFormGeneralContractor(PersonOrgaForm):
                     new=True),
                 validators=[valid_id(Person)])
             self.fields.pop(self.ORGA_FIELD)
-        """
-        else:
-            self.fields[self.ORGA_FIELD] = forms.IntegerField(
-                label=self.ORGA_LABEL,
-                required=False,
-                initial=initial.get(self.ORGA_FIELD, None),
-                widget=widgets.JQueryPersonOrganization(
-                    reverse_lazy('autocomplete-organization',
-                                 args=[self.ORGA_TYPE.pk]),
-                    reverse_lazy('organization_create'),
-                    model=models.Organization,
-                    limit={'organization_type': [self.ORGA_TYPE.pk]},
-                    js_template='ishtar/blocks/JQueryCorporationPerson.js',
-                    new=True),
-                validators=[valid_id(models.Organization)])"""
 
 
 class FileFormPlanningService(forms.Form):