From 75aba1b210d90181bb7978cca83bf3df2a4b8c84 Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Wed, 27 May 2015 01:13:14 +0200
Subject: [PATCH] Updated node types

---
 attract/manage.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/attract/manage.py b/attract/manage.py
index b656126b..31115282 100644
--- a/attract/manage.py
+++ b/attract/manage.py
@@ -84,11 +84,13 @@ def populate_node_types(old_ids={}):
             },
             "status": {
                 "type": "string",
-                "allowed": ["on_hold",
-                            "todo",
-                            "in_progress",
-                            "review_required",
-                            "final"],
+                "allowed": [
+                    "on_hold",
+                    "todo",
+                    "in_progress",
+                    "review_required",
+                    "final"
+                ],
             },
             "notes": {
                 "type": "string",
@@ -127,15 +129,21 @@ def populate_node_types(old_ids={}):
                 "type": "string",
                 "allowed": [
                     "todo",
-                    "in-progress",
+                    "in_progress",
                     "done",
                     "cbb",
-                    "final1",
-                    "final2",
-                    "review"
+                    "final",
+                    "review",
+                    "conflict"
                 ],
                 "required": True,
             },
+            "filepath": {
+                "type": "string",
+            },
+            "revision": {
+                "type": "integer",
+            },
             "owners": {
                 "type": "dict",
                 "schema": {
@@ -181,12 +189,14 @@ def populate_node_types(old_ids={}):
         },
         "form_schema": {
             "status": {},
+            "filepath": {},
+            "revision": {},
             "owners": {
                 "schema": {
                     "users":{
                         "items": [('User', 'email')],
                     },
-                    "groups":{}
+                    "groups": {}
                 }
             },
             "time": {