summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-31 15:31:30 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-31 15:31:30 +0100
commitf25285634613ff5beeb0c360d817835738e72b40 (patch)
treea63fcd260fe641ea27f74291ca2ed36e6a816a74 /chimere/models.py
parentb845195fda9c4e9fb79c3f6272d8de202822f57e (diff)
downloadChimère-f25285634613ff5beeb0c360d817835738e72b40.tar.bz2
Chimère-f25285634613ff5beeb0c360d817835738e72b40.zip
JS: preload icon images
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py18
1 files changed, 13 insertions, 5 deletions
diff --git a/chimere/models.py b/chimere/models.py
index a34635d..01d6af0 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -279,14 +279,22 @@ class SubCategory(models.Model):
[(subcat.pk, subcat.name) for subcat in subcats]))
return cats
+ def getJSONDict(self):
+ items = {'id':self.pk, 'name':self.name,
+ 'description':self.description if self.description\
+ else '',
+ 'icon':{'url':self.icon.image.url,
+ 'width':self.icon.image.width,
+ 'height':self.icon.image.height}
+ }
+ if self.hover_icon:
+ items['icon_hover'] = {'url':cat.hover_icon.image.url}
+ return items
+
def getJSON(self, categories_id=[]):
'''Return a JSON string - mainly used to get description
'''
- items = {'id':self.pk, 'name':json.dumps(self.name),
- 'description':json.dumps(self.description) if self.description\
- else ''}
- json_string = u'{"pk": %(id)d, "name": %(name)s, '\
- u'"description":%(description)s}' % items
+ json_string = json.dumps(self.getJSONDict())
return json_string
IMPORTERS = {'KML':KMLManager,