summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-05-07 17:39:14 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-05-07 17:39:14 +0200
commit6d1f38299eecdd7e63aad845ba535000a78c59ff (patch)
tree847861f32ed53f89619d44b12b36cda39d742e77 /chimere/models.py
parentb6676fb56e4278a43e9c239175f13b5689757abc (diff)
downloadChimère-6d1f38299eecdd7e63aad845ba535000a78c59ff.tar.bz2
Chimère-6d1f38299eecdd7e63aad845ba535000a78c59ff.zip
Improve subcategories and areas inside the admin
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py
index 622580f..96430ff 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -147,8 +147,6 @@ class SubCategory(models.Model):
category = models.ForeignKey(Category, verbose_name=_(u"Category"))
name = models.CharField(_(u"Name"), max_length=150)
available = models.BooleanField(_(u"Available"))
- areas = SelectMultipleField('Area', related_name='subcategories',
- blank=True)
icon = models.ForeignKey(Icon, verbose_name=_(u"Icon"))
color_theme = models.ForeignKey(ColorTheme, verbose_name=_(u"Color theme"),
blank=True, null=True)
@@ -534,7 +532,6 @@ def picturefile_post_save(sender, **kwargs):
picturefile.save()
post_save.connect(picturefile_post_save, sender=PictureFile)
-
class RouteFile(models.Model):
name = models.CharField(_(u"Name"), max_length=150)
raw_file = models.FileField(_(u"Raw file (gpx or kml)"), upload_to='route_files')
@@ -800,6 +797,10 @@ class Area(models.Model, SimpleArea):
through='AreaLayers', blank=True)
default_subcategories = SelectMultipleField(SubCategory, blank=True,
verbose_name=_(u"Categories checked by default"))
+ subcategories = SelectMultipleField(SubCategory, related_name='areas',
+ blank=True, db_table='chimere_subcategory_areas',
+ verbose_name=_(u"Restricted to theses subcategories"),
+ help_text=_(u"If no subcategory is set all subcategories are available"))
objects = models.GeoManager()
def __unicode__(self):