Changeset 59 for ATGoogleMaps

Timestamp:

07/11/06 23:57:54 (6 years ago)

Author:

takanori

Message:

latlng フィールドを辞書型に変更

File:

• ATGoogleMaps/trunk/field.py (modified) (4 diffs)

ATGoogleMaps/trunk/field.py

@@ -13 +13 @@
     _properties = Field._properties.copy()
     _properties.update({
-        'type' : 'latlng',
+        'type': 'latlng',
+        'default': {},
         'size': 12,
         'default': None,
@@ -27 +28 @@
             float(value.latitude)
             float(value.longitude)
-        except:
+        except (ValueError, TypeError):
             result = False
         else:
@@ -35 +36 @@
     security.declarePrivate('get')
     def get(self, instance, **kwargs):
-        value = ObjectField.get(self, instance, **kwargs)
-        return value
+        return ObjectField.get(self, instance, **kwargs)
 
     security.declarePrivate('set')
     def set(self, instance, value, **kwargs):
+        if type(value) != type({}) and hasattr(value, 'keys'):
+            new_value = {}
+            new_value.update(value)
+            value = new_value
+            
         ObjectField.set(self, instance, value, **kwargs)
 
@@ -46 +51 @@
 registerField(LatLngField,
               title="LatLng",
-              description="Used to store latitude and longitude.",
+              description="Used to store longitude and longitude.",
               )