diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 00:17:38 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 00:17:38 +0200 |
| commit | 9bb8f0705c848d0781e1f978de53c6ead4be7a69 (patch) | |
| tree | 6b452978d3831fd5b0faee84ad2bae687dd4d992 /ishtar_common/models.py | |
| parent | 89a732992a51da9a6a0ff2d0e91d998d857d6307 (diff) | |
| parent | 75cb3836cc42a62859deeac0cd2bca704710c1c9 (diff) | |
| download | Ishtar-9bb8f0705c848d0781e1f978de53c6ead4be7a69.tar.bz2 Ishtar-9bb8f0705c848d0781e1f978de53c6ead4be7a69.zip | |
Merge branch 'stable'
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a25cd5e3a..6a3e2ae52 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1395,7 +1395,7 @@ class Import(models.Model): actions.append(('A', _(u"Re-analyse"))) actions.append(('I', _(u"Re-import"))) actions.append(('AC', _(u"Archive"))) - if self.state in ('AC'): + if self.state == 'AC': actions.append(('A', _(u"Unarchive"))) actions.append(('D', _(u"Delete"))) return actions @@ -1459,6 +1459,7 @@ class Import(models.Model): self.error_file = File(open(fle.name)) else: self.state = 'F' + self.error_file = None self.save() def archive(self): |