Merge remote-tracking branch 'origin/master'

This commit is contained in:
2017-03-28 16:43:22 +02:00
10 changed files with 567 additions and 44303 deletions

View File

@@ -7,6 +7,11 @@ node_type_hdri = {
'description': 'HDR Image',
'parent': ['group_hdri'],
'dyn_schema': {
# Default yaw angle in degrees.
'default_yaw': {
'type': 'float',
'default': 0.0
},
'status': {
'type': 'string',
'allowed': [

View File

@@ -85,7 +85,7 @@ def add_form_properties(form_class, node_type):
elif field_type == 'integer':
field = IntegerField(prop_name, default=0)
elif field_type == 'float':
field = FloatField(prop_name, default=0)
field = FloatField(prop_name, default=0.0)
elif field_type == 'boolean':
field = BooleanField(prop_name)
elif field_type == 'objectid' and 'data_relation' in schema_prop:
@@ -168,10 +168,15 @@ def process_node_form(form, node_id=None, node_type=None, user=None):
if schema_prop['type'] == 'dict':
data = attachments.attachment_form_parse_post_data(data)
elif schema_prop['type'] == 'integer':
if data == '':
data = 0
if not data:
data = None
else:
data = int(form[prop_name].data)
elif schema_prop['type'] == 'float':
if not data:
data = None
else:
data = float(form[prop_name].data)
elif schema_prop['type'] == 'datetime':
data = datetime.strftime(data, current_app.config['RFC1123_DATE_FORMAT'])
elif schema_prop['type'] == 'list':

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

File diff suppressed because one or more lines are too long