Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

1 files changed, 14 insertions, 1 deletions

diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 60ee06a9c..9826fbfad 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -282,7 +282,8 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms):
     operator = models.ForeignKey(Organization, blank=True, null=True,
                     verbose_name=_(u"Archaeological preventive operator"))
     scientific = models.ForeignKey(Person, blank=True, null=True,
-related_name='+', verbose_name=_(u"Person in charge of the scientific part"))
+                    related_name='+',
+                    verbose_name=_(u"Person in charge of the scientific part"))
     signatory = models.ForeignKey(Person, blank=True, null=True,
                     related_name='+', verbose_name=_(u"Signatory"))
     operation = models.ForeignKey(Operation, blank=True, null=True,
@@ -362,6 +363,18 @@ class Parcel(LightHistorizedItem):
                                           if item]
         return settings.JOINT.join(items)
 
+def parcel_post_save(sender, **kwargs):
+    if not kwargs['instance'] or not FILES_AVAILABLE:
+        return
+    parcel = kwargs['instance']
+    if parcel.operation and parcel.associated_file:
+        return
+    if parcel.operation and parcel.operation.associated_file:
+        parcel.associated_file = parcel.operation.associated_file
+        parcel.save()
+        return
+post_save.connect(parcel_post_save, sender=Parcel)
+
 class ParcelOwner(LightHistorizedItem):
     owner = models.ForeignKey(Person, verbose_name=_(u"Owner"))
     parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"))