diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-19 02:28:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-19 02:28:23 +0200 |
| commit | 192460d885867ddf6ef355452dc2c7e96907c1b2 (patch) | |
| tree | 0abb2eb4da4b2945ee54eaffca40a26c750438e5 | |
| parent | 97d46a965ab438893335d03847def33f95468515 (diff) | |
| parent | 74d6b2f402107644c275cfc5a25408236648a27e (diff) | |
| download | Chimère-192460d885867ddf6ef355452dc2c7e96907c1b2.tar.bz2 Chimère-192460d885867ddf6ef355452dc2c7e96907c1b2.zip | |
Merge branch 'master' into saclay
| -rw-r--r-- | chimere/models.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py index 01d5f27..006ec1a 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -398,10 +398,14 @@ class Marker(GeographicItem): def __init__(self, *args, **kwargs): super(Marker, self).__init__(*args, **kwargs) # add read attributes for properties - for property in self.getProperties(): - attr_name = property.propertymodel.getAttrName() + for pm in self.properties(): + attr_name = pm.getAttrName() if not hasattr(self, attr_name): - setattr(self, attr_name, property.python_value) + val = None + property = self.getProperty(pm) + if property: + val = property.python_value + setattr(self, attr_name, val) def get_init_multi(self): multis = [forms.model_to_dict(multi) |