archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Simplified settings by introducing _node_embedded_schema.

Browse Source 
This follows the same style as the already-existing _file_embedded_schema.
This commit is contained in:
Sybren A. Stüvel 2016-07-19 12:33:42 +02:00
parent 3ddfbddf1a
commit fe148e1e6b
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pillar/settings.py
View File

@ -21,6 +21,15 @@ _file_embedded_schema = {
}
}
_node_embedded_schema = {
'type': 'objectid',
'data_relation': {
'resource': 'nodes',
'field': '_id',
'embeddable': True
}
}
_required_user_embedded_schema = {
'type': 'objectid',
'required': True,
@ -147,15 +156,9 @@ organizations_schema = {
'type': 'string',
'maxlength': 256,
},
'picture': {
'type': 'objectid',
'nullable': True,
'data_relation': {
'resource': 'files',
'field': '_id',
'embeddable': True
},
},
'picture': dict(
nullable=True,
**_file_embedded_schema),
'users': {
'type': 'list',
'default': [],
@ -271,14 +274,7 @@ nodes_schema = {
'description': {
'type': 'string',
},
'picture': {
'type': 'objectid',
'data_relation': {
'resource': 'files',
'field': '_id',
'embeddable': True
},
},
'picture': _file_embedded_schema,
'order': {
'type': 'integer',
'minlength': 0,
@ -286,14 +282,7 @@ nodes_schema = {
'revision': {
'type': 'integer',
},
'parent': {
'type': 'objectid',
'data_relation': {
'resource': 'nodes',
'field': '_id',
'embeddable': True
},
},
'parent': _node_embedded_schema,
'project': {
'type': 'objectid',
'data_relation': {