Skip to content
This repository has been archived by the owner on Apr 9, 2023. It is now read-only.

Commit

Permalink
Use zope schema setter and getter
Browse files Browse the repository at this point in the history
  • Loading branch information
Ramon Navarro Bosch committed Jan 4, 2017
1 parent b3403b7 commit a71b8f1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
3 changes: 3 additions & 0 deletions src/plone.server/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
1.0a9 (unreleased)
------------------

- User zope.schema getter and setter to set attributes
[ramonnb]

- Add functionality like virtualhost monster to define the urls
[ramonnb]

Expand Down
5 changes: 4 additions & 1 deletion src/plone.server/plone/server/json/deserialize_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ def set_schema(
errors.append({
'message': e.args[0], 'field': name, 'error': e})
else:
setattr(obj, name, value)
try:
field.set(obj, value)
except:
setattr(obj, name, value)
else:
if f.required and not hasattr(obj, name):
errors.append({
Expand Down
9 changes: 6 additions & 3 deletions src/plone.server/plone/server/json/serialize_content_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ def __call__(self):
return json_compatible(self.get_value())

def get_value(self, default=None):
return getattr(self.context,
self.field.__name__,
default)
try:
return self.field.get(self.context)
except:
return getattr(self.context,
self.field.__name__,
default)

0 comments on commit a71b8f1

Please sign in to comment.