Merge branch 'v2.2'

1 files changed, 5 insertions, 2 deletions

diff --git a/chimere/models.py b/chimere/models.py
index cae9503..c5ed2c8 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -46,7 +46,8 @@ from django.utils.translation import ugettext_lazy as _
 from chimere.widgets import HiddenPointChooserWidget, PointField, RouteField, \
     SelectMultipleField, TextareaWidget, DatePickerWidget, PolygonField
 from chimere.utils import KMLManager, OSMManager, ShapefileManager, \
-    GeoRSSManager, CSVManager, HtmlXsltManager, XMLXsltManager, JsonManager
+    GeoRSSManager, CSVManager, HtmlXsltManager, XMLXsltManager, JsonManager, \
+    IcalManager
 
 
 class Page(models.Model):
@@ -376,6 +377,7 @@ IMPORTERS = {'KML': KMLManager,
              'RSS': GeoRSSManager,
              'CSV': CSVManager,
              'JSON': JsonManager,
+             'ICAL': IcalManager,
              'XSLT': HtmlXsltManager,
              'XXLT': XMLXsltManager
              }
@@ -386,6 +388,7 @@ IMPORTER_CHOICES = (('KML', 'KML'),
                     ('RSS', 'GeoRSS'),
                     ('CSV', 'CSV'),
                     ('JSON', 'JSON'),
+                    ('ICAL', 'ICAL'),
                     ('XSLT', 'HTML-XSLT'),
                     ('XXLT', 'XML-XSLT'),
                     )
@@ -482,7 +485,7 @@ class ImporterKeyCategories(models.Model):
 
 
 class GeographicItem(models.Model):
-    name = models.CharField(_(u"Name"), max_length=150)
+    name = models.TextField(_(u"Name"))
     categories = SelectMultipleField(SubCategory)
     submiter_session_key = models.CharField(
         _(u"Submitter session key"), blank=True, null=True, max_length=40)