Merge branch 'develop'

MAPC · Jan 15, 2013 · a96e488 · a96e488
2 parents 87a8026 + c75e22d
commit a96e488
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/parkmap/admin.py b/parkmap/admin.py
@@ -11,10 +11,10 @@
 
 
 class ParkAdmin(admin.OSMGeoAdmin):
-    prepopulated_fields = {'slug': ('name',)}
     list_display = ['name', 'parkowner' ]
     list_filter = ('neighborhoods', )
     search_fields = ['name']
+    exclude = ('slug', )
 
     def park_image_thumb(self, obj):
          if obj.image:

diff --git a/parkmap/models.py b/parkmap/models.py
@@ -173,6 +173,7 @@ def lat_long(self):
     def save(self, *args, **kwargs):
 
         self.area = self.geometry.area
+        self.slug = slugify(self.name)
 
         super(Park, self).save(*args, **kwargs)
 
@@ -237,7 +238,7 @@ class Facility(models.Model):
     """
 
     name = models.CharField(max_length=50, blank=True, null=True)
-    facilitytype = models.ForeignKey(Facilitytype, blank=True, null=True)
+    facilitytype = models.ForeignKey(Facilitytype)
     activity = models.ManyToManyField(Activity, related_name='activity')
     location = models.CharField(max_length=50, blank=True, null=True, help_text='Address, nearby Landmark or similar location information.')
     status = models.CharField(max_length=50, blank=True, null=True)  # FIXME: choices?