diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-13 12:16:20 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-13 14:01:49 +0100 |
| commit | e3a1f1aa0d0aa05f8f969adb3e40701aaa9ad39f (patch) | |
| tree | f6ad0bb49a22c357fcb4ef77e07029f9ba879632 /ishtar_common/models.py | |
| parent | e2321b650989bfb79975a6ba5b6758d36d0189d0 (diff) | |
| download | Ishtar-e3a1f1aa0d0aa05f8f969adb3e40701aaa9ad39f.tar.bz2 Ishtar-e3a1f1aa0d0aa05f8f969adb3e40701aaa9ad39f.zip | |
Imports: add a name (refs #3452)
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a2341abdc..3b3f9d141 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2276,6 +2276,8 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING), class Import(models.Model): user = models.ForeignKey('IshtarUser') + name = models.CharField(_(u"Name"), max_length=500, + blank=True, null=True) importer_type = models.ForeignKey(ImporterType) imported_file = models.FileField( _(u"Imported file"), upload_to="upload/imports/", max_length=220) @@ -2313,8 +2315,7 @@ class Import(models.Model): verbose_name_plural = _(u"Imports") def __unicode__(self): - return u"%s - %s - %d" % (unicode(self.importer_type), - unicode(self.user), self.pk) + return u"{} | {}".format(self.name or u"-", self.importer_type) def need_matching(self): return bool(TargetKey.objects.filter(associated_import=self, |