Work on KML import

1 files changed, 9 insertions, 5 deletions

diff --git a/chimere/models.py b/chimere/models.py
index 29c744d..21fdd4e 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -207,12 +207,16 @@ class Importer(models.Model):
                                   blank=True, null=True)
     filtr = models.CharField(_(u"Filter"), max_length=200,
                              blank=True, null=True)
-    subcategory = models.ForeignKey(SubCategory,
-                         verbose_name=_(u"Associated subcategory"))
+    categories = SelectMultipleField(SubCategory,
+                      verbose_name=_(u"Associated subcategories"))
 
     class Meta:
         verbose_name = _(u"Importer")
 
+    @property
+    def manager(self):
+        return IMPORTERS[self.importer_type](self)
+
 class GeographicItem(models.Model):
     name = models.CharField(_(u"Name"), max_length=150)
     categories = SelectMultipleField(SubCategory)
@@ -228,12 +232,12 @@ class GeographicItem(models.Model):
               ('D', _(u'Disabled')),
               ('I', _(u'Imported')),
               ('E', _(u"Excluded")))
-    STATUS_DCT = {}
-    for key, label in STATUS:
-        STATUS_DCT[key] = label
+    STATUS_DCT = dict(STATUS)
     status = models.CharField(_(u"Status"), max_length=1, choices=STATUS)
     import_key = models.CharField(_(u"Import key"), max_length=200,
                                   blank=True, null=True)
+    import_source = models.CharField(_(u"Source"), max_length=200,
+                                     blank=True, null=True)
     if settings.CHIMERE_DAYS_BEFORE_EVENT:
         start_date = models.DateField(_(u"Start date"), blank=True, null=True,
             help_text=_(u"Not mandatory. Set it for dated item such as event. "\