On 08/02/13 02:46, David Lutterkort wrote: > On Thu, 2013-01-31 at 19:14 +0200, [email protected] wrote: >> diff --git a/server/lib/cimi/models/address_template.rb >> b/server/lib/cimi/models/address_template.rb >> index 41d86f6..b804396 100644 >> --- a/server/lib/cimi/models/address_template.rb >> +++ b/server/lib/cimi/models/address_template.rb >> @@ -67,7 +67,7 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base >> :dns => json['dns'], >> :protocol => json['protocol'], >> :mask => json['mask'], >> - :ent_properties => json['properties'].to_json >> + :ent_properties => json['properties'] ? json['properties'].to_json : >> {} > > You're assigning either a string or a hash; shouldn't that be > :ent_properties => (json['properties'] || {}).to_json > right thanks - these were already pushed (we need to come up with a way of relating tracker to list so people know if a patch on list has already been dealt with)
I made the edits as you suggest and they are at http://tracker.deltacloud.org/set/305 marios > Other than that, ACK to the patch - though we should get rid of handling > json/xml representations directly in favor of XXXCreate models. > > David > >
