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

Updated node types

Browse Source
This commit is contained in:
Francesco Siddi 2015-05-28 15:30:26 +02:00
parent 814db4676a
commit 80c019c921
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attract/application/__init__.py
View File

@ -161,7 +161,7 @@ class ValidateCustomFields(Validator):
value = convert_properties(value, node_type['dyn_schema']) value = convert_properties(value, node_type['dyn_schema'])
except Exception, e: except Exception, e:
print ("Error converting: {0}".format(e)) print ("Error converting: {0}".format(e))
print (value) #print (value)
v = Validator(node_type['dyn_schema']) v = Validator(node_type['dyn_schema'])
val = v.validate(value) val = v.validate(value)

26
attract/manage.py
View File

@ -88,7 +88,7 @@ def populate_node_types(old_ids={}):
"on_hold", "on_hold",
"todo", "todo",
"in_progress", "in_progress",
"review_required", "review",
"final" "final"
], ],
}, },
@ -96,15 +96,15 @@ def populate_node_types(old_ids={}):
"type": "string", "type": "string",
"maxlength": 256, "maxlength": 256,
}, },
"order": {
"type": "integer",
},
"shot_group": { "shot_group": {
"type": "string", "type": "string",
#"data_relation": { #"data_relation": {
# "resource": "nodes", # "resource": "nodes",
# "field": "_id", # "field": "_id",
#}, #},
},
"order": {
"type": "integer",
} }
}, },
"form_schema": { "form_schema": {
@ -134,8 +134,7 @@ def populate_node_types(old_ids={}):
"approved", "approved",
"cbb", "cbb",
"final", "final",
"review", "review"
"conflict"
], ],
"required": True, "required": True,
}, },
@ -186,7 +185,17 @@ def populate_node_types(old_ids={}):
} }
}, },
} }
},
"is_conflicting" : {
"type": "boolean"
},
"is_processing" : {
"type": "boolean"
},
"is_open" : {
"type": "boolean"
} }
}, },
"form_schema": { "form_schema": {
"status": {}, "status": {},
@ -212,7 +221,10 @@ def populate_node_types(old_ids={}):
} }
} }
} }
} },
"is_conflicting": {},
"is_open": {},
"is_processing": {},
}, },
"parent": { "parent": {
"node_types": ["shot"], "node_types": ["shot"],