From: Guillaume Pellerin Date: Mon, 23 Jun 2014 16:38:25 +0000 (+0200) Subject: push to box in post_save X-Git-Tag: 1.1~465 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=50713b076f0371ee63c9a33b576a3e75affed917;p=teleforma.git push to box in post_save --- diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index 504e80cb..eb929ae4 100644 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -276,14 +276,6 @@ class Script(BaseResource): super(Script, self).save(*args, **kwargs) - def submit(self): - self.date_submitted = datetime.datetime.now() - self.url = settings.MEDIA_URL + unicode(self.file) - self.box_uuid = crocodoc.document.upload(url=self.url) - self.status = 3 - if not self.corrector: - self.auto_set_corrector() - def mark(self): self.date_marked = datetime.datetime.now() context = {} @@ -322,18 +314,17 @@ def set_file_properties(sender, instance, **kwargs): os.system(command) instance.image = path -def set_file_properties(sender, instance, **kwargs): - if instance.file: - if not instance.mime_type: - instance.mime_type = mimetype_file(instance.file.path) - if not instance.sha1: - instance.sha1 = sha1sum_file(instance.file.path) - if hasattr(instance, 'image'): - if not instance.image: - path = cache_path + os.sep + instance.uuid + '.jpg' - command = 'convert ' + instance.file.path + ' ' + path - os.system(command) - instance.image = path +def submit_to_box(sender, instance, **kwargs): + if instance.file and instance.status = 2: + instance.date_submitted = datetime.datetime.now() + instance.url = settings.MEDIA_URL + unicode(instance.file) + instance.box_uuid = crocodoc.document.upload(url=instance.url) + instance.status = 3 + if not instance.corrector: + instance.auto_set_corrector() + instance.save() + -post_save.connect(set_file_properties, sender=Script, dispatch_uid="script_post_save") +post_save.connect(submit_to_box, sender=Script, dispatch_uid="script_post_save") +# post_save.connect(set_file_properties, sender=Script, dispatch_uid="script_post_save") post_save.connect(set_file_properties, sender=ScriptPage, dispatch_uid="scriptpage_post_save")