diff --git a/attract/application/__init__.py b/attract/application/__init__.py index 6e50cd2b..2ea519f8 100644 --- a/attract/application/__init__.py +++ b/attract/application/__init__.py @@ -161,7 +161,7 @@ class ValidateCustomFields(Validator): value = convert_properties(value, node_type['dyn_schema']) except Exception, e: print ("Error converting: {0}".format(e)) - print (value) + #print (value) v = Validator(node_type['dyn_schema']) val = v.validate(value) diff --git a/attract/manage.py b/attract/manage.py index 210eac35..0ce906ae 100644 --- a/attract/manage.py +++ b/attract/manage.py @@ -88,7 +88,7 @@ def populate_node_types(old_ids={}): "on_hold", "todo", "in_progress", - "review_required", + "review", "final" ], }, @@ -96,15 +96,15 @@ def populate_node_types(old_ids={}): "type": "string", "maxlength": 256, }, - "order": { - "type": "integer", - }, "shot_group": { "type": "string", #"data_relation": { # "resource": "nodes", # "field": "_id", #}, + }, + "order": { + "type": "integer", } }, "form_schema": { @@ -134,8 +134,7 @@ def populate_node_types(old_ids={}): "approved", "cbb", "final", - "review", - "conflict" + "review" ], "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": { "status": {}, @@ -212,7 +221,10 @@ def populate_node_types(old_ids={}): } } } - } + }, + "is_conflicting": {}, + "is_open": {}, + "is_processing": {}, }, "parent": { "node_types": ["shot"],