Make Chimère compatible with Django 1.2

4 files changed, 22 insertions, 8 deletions

diff --git a/chimere/main/admin.py b/chimere/main/admin.py
index 31c9d5c..0f8231f 100644
--- a/chimere/main/admin.py
+++ b/chimere/main/admin.py
@@ -49,6 +49,7 @@ class MarkerAdmin(admin.ModelAdmin):
     search_fields = ("name",)
     list_display = ('name', 'subcategory', 'status')
     list_filter = ('status', 'subcategory')
+    exclude = ['height', 'width']
     form = MarkerAdminForm
 
     def queryset(self, request):
@@ -71,6 +72,7 @@ class RouteAdmin(admin.ModelAdmin):
     search_fields = ("name",)
     list_display = ('name', 'subcategory', 'status')
     list_filter = ('status', 'subcategory')
+    exclude = ['height', 'width']
     form = RouteAdminForm
 
     def queryset(self, request):
@@ -119,10 +121,13 @@ class ColorInline(admin.TabularInline):
 class ColorThemeAdmin(admin.ModelAdmin):
     inlines = [ColorInline,]
 
+class IconAdmin(admin.ModelAdmin):
+    exclude = ['height', 'width']
+
 # register of differents database fields
 admin.site.register(News, NewsAdmin)
 admin.site.register(Category, CategoryAdmin)
-admin.site.register(Icon)
+admin.site.register(Icon, IconAdmin)
 admin.site.register(SubCategory, SubCategoryAdmin)
 admin.site.register(Marker, MarkerAdmin)
 admin.site.register(Route, RouteAdmin)
diff --git a/chimere/main/forms.py b/chimere/main/forms.py
index f2490da..2eff8b1 100644
--- a/chimere/main/forms.py
+++ b/chimere/main/forms.py
@@ -247,8 +247,10 @@ class AreaAdminForm(forms.ModelForm):
         """
         Custom save method in order to manage area
         """
+        print 1
         new_area = super(AreaAdminForm, self).save(*args, **keys)
         area = self.cleaned_data['area']
+        print 2
         new_area.upper_left_corner = 'POINT(%s %s)' % (area[0][0], area[0][1])
         new_area.lower_right_corner = 'POINT(%s %s)' % (area[1][0],
                                                          area[1][1])
diff --git a/chimere/main/models.py b/chimere/main/models.py
index f8f4c80..5744529 100644
--- a/chimere/main/models.py
+++ b/chimere/main/models.py
@@ -41,6 +41,7 @@ class News(models.Model):
         return self.title
     class Meta:
         verbose_name = _("News")
+        verbose_name_plural = _("News")
 
 class TinyUrl(models.Model):
     """Tinyfied version of permalink parameters
@@ -121,6 +122,8 @@ class Icon(models.Model):
     name = models.CharField(_("Name"), max_length=150)
     image = models.ImageField(_("Image"), upload_to='icons',
                               height_field='height', width_field='width')
+    height = models.IntegerField(_("Height"))
+    width = models.IntegerField(_("Width"))
     def __unicode__(self):
         return self.name
     class Meta:
@@ -183,9 +186,11 @@ class Marker(models.Model):
     '''
     name = models.CharField(_("Name"), max_length=150)
     subcategory = models.ForeignKey(SubCategory, verbose_name=_("Subcategory"))
-    point = PointField(_("Localisation"))
+    point = PointField(_("Localisation"), srid=settings.EPSG_DISPLAY_PROJECTION)
     picture = models.ImageField(_("Image"), upload_to='upload', blank=True,
-                                height_field='height', width_field='width')
+                          null=True, height_field='height', width_field='width')
+    height = models.IntegerField(_("Height"), blank=True, null=True)
+    width = models.IntegerField(_("Width"), blank=True, null=True)
     STATUS = (('S', _('Submited')),
               ('A', _('Available')),
               ('D', _('Disabled')),)
@@ -251,9 +256,11 @@ class Route(models.Model):
     '''
     name = models.CharField(_("Name"), max_length=150)
     subcategory = models.ForeignKey(SubCategory, verbose_name=_("Subcategory"))
-    route = RouteField(_("Route"))
+    route = RouteField(_("Route"), srid=settings.EPSG_DISPLAY_PROJECTION)
     picture = models.ImageField(_("Image"), upload_to='upload', blank=True,
-                                height_field='height', width_field='width')
+                          null=True, height_field='height', width_field='width')
+    height = models.IntegerField(_("Height"), blank=True, null=True)
+    width = models.IntegerField(_("Width"), blank=True, null=True)
     STATUS = (('S', _('Submited')),
               ('A', _('Available')),
               ('D', _('Disabled')),)
@@ -393,9 +400,9 @@ class Area(models.Model, SimpleArea):
     order = models.IntegerField(_("Order"))
     available = models.BooleanField(_("Available"))
     upper_left_corner = models.PointField(_("Upper left corner"),
-                                          default='POINT(0 0)')
+                    default='POINT(0 0)', srid=settings.EPSG_DISPLAY_PROJECTION)
     lower_right_corner = models.PointField(_("Lower right corner"),
-                                           default='POINT(0 0)')
+                    default='POINT(0 0)', srid=settings.EPSG_DISPLAY_PROJECTION)
     objects = models.GeoManager()
 
     def __unicode__(self):
diff --git a/chimere/main/widgets.py b/chimere/main/widgets.py
index 195414b..e3977a1 100644
--- a/chimere/main/widgets.py
+++ b/chimere/main/widgets.py
@@ -131,7 +131,7 @@ class PointField(models.PointField):
         keys.update(defaults)
         return super(PointField, self).formfield(**keys)
 
-    def clean(self, value):
+    def clean(self, value, instance=None):
         if len(value) != 2 and self.required:
             raise ValidationError(_("Invalid point"))
         return value