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 1/4] 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": {

From 814db4676a72ec00e2c00cdcd52b9e263814ab6d Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Wed, 27 May 2015 01:34:28 +0200
Subject: [PATCH 2/4] Update to manage.py

---
 attract/manage.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/attract/manage.py b/attract/manage.py
index 31115282..210eac35 100644
--- a/attract/manage.py
+++ b/attract/manage.py
@@ -130,7 +130,8 @@ def populate_node_types(old_ids={}):
                 "allowed": [
                     "todo",
                     "in_progress",
-                    "done",
+                    "on_hold",
+                    "approved",
                     "cbb",
                     "final",
                     "review",
@@ -194,7 +195,7 @@ def populate_node_types(old_ids={}):
             "owners": {
                 "schema": {
                     "users":{
-                        "items": [('User', 'email')],
+                        "items": [('User', 'first_name')],
                     },
                     "groups": {}
                 }

From 80c019c921550c729524250cfee6d93e6f82aec7 Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Thu, 28 May 2015 15:30:26 +0200
Subject: [PATCH 3/4] Updated node types

---
 attract/application/__init__.py |  2 +-
 attract/manage.py               | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

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"],

From 4d8acde94c1642d059eebaaaa37e13160bfa7927 Mon Sep 17 00:00:00 2001
From: Eibriel <eibriel@yahoo.com.ar>
Date: Thu, 28 May 2015 13:21:50 -0300
Subject: [PATCH 4/4] Removed order from dyn_schema, added
 remove_properties_order script

---
 attract/manage.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/attract/manage.py b/attract/manage.py
index 0ce906ae..6e3cdf08 100644
--- a/attract/manage.py
+++ b/attract/manage.py
@@ -45,6 +45,25 @@ def clear_db():
     db.drop_collection('users')
 
 
+@manager.command
+def remove_properties_order():
+    """Removes properties.order
+    """
+    from pymongo import MongoClient
+    client = MongoClient()
+    db = client.eve
+    nodes = db.nodes.find()
+    for node in nodes:
+        new_prop = {}
+        for prop in node['properties']:
+            if prop == 'order':
+                continue
+            else:
+                new_prop[prop] = node['properties'][prop]
+        db.nodes.update({"_id": node['_id']},
+                        {"$set": {"properties": new_prop}})
+
+
 @manager.command
 def upgrade_node_types():
     """Wipes node_types collection
@@ -103,9 +122,6 @@ def populate_node_types(old_ids={}):
                 #    "field": "_id",
                 #},
             },
-            "order": {
-                "type": "integer",
-            }
         },
         "form_schema": {
             "url": {},
@@ -113,7 +129,6 @@ def populate_node_types(old_ids={}):
             "cut_out": {},
             "status": {},
             "notes": {},
-            "order": {},
             "shot_group": {}
         },
         "parent": {