From a1108f50a6d9606d2b168e7bd84a1f625fba35cf Mon Sep 17 00:00:00 2001
From: Eibriel <eibriel@yahoo.com.ar>
Date: Wed, 15 Apr 2015 10:25:31 -0300
Subject: [PATCH] Added Task assignation to users

Now you can populate form lists using form schema
Some items changed from string to objectid
Proper validation for lists and objectids
---
 attract/application/__init__.py | 28 ++++++++++++++++++++++++++--
 attract/manage.py               |  8 +++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/attract/application/__init__.py b/attract/application/__init__.py
index 0da11f66..ab71898a 100644
--- a/attract/application/__init__.py
+++ b/attract/application/__init__.py
@@ -124,14 +124,30 @@ class CustomTokenAuth(BasicsAuth):
 
 def convert_properties(properties, node_schema):
     for prop in node_schema:
+        if not prop in properties:
+            continue
         schema_prop = node_schema[prop]
         prop_type = schema_prop['type']
         if prop_type == 'dict':
             properties[prop] = convert_properties(
                 properties[prop], schema_prop['schema'])
+        if prop_type == 'list':
+            if properties[prop] == '':
+                properties[prop] = []
+            for k, val in enumerate(properties[prop]):
+                if not 'schema' in schema_prop:
+                    continue
+                item_schema = {'item': schema_prop['schema']}
+                item_prop = {'item': properties[prop][k]}
+                properties[prop][k] = convert_properties(
+                    item_prop, item_schema)['item']
+        # Convert datetime string to RFC1123 datetime
         elif prop_type == 'datetime':
             prop_val = properties[prop]
             properties[prop] = datetime.strptime(prop_val, RFC1123_DATE_FORMAT)
+        elif prop_type == 'objectid':
+            prop_val = properties[prop]
+            properties[prop] = ObjectId(prop_val)
 
     return properties
 
@@ -142,14 +158,22 @@ class ValidateCustomFields(Validator):
         lookup['_id'] = ObjectId(self.document['node_type'])
         node_type = node_types.find_one(lookup)
 
-        value = convert_properties(value, node_type['dyn_schema'])
+        try:
+            value = convert_properties(value, node_type['dyn_schema'])
+        except:
+            print ("Error converting")
+        print (value)
 
         v = Validator(node_type['dyn_schema'])
         val = v.validate(value)
+
         if val:
             return True
         else:
-            print (val.errors)
+            try:
+                print (val.errors)
+            except:
+                pass
             self._error(
                 field, "Error validating properties")
 
diff --git a/attract/manage.py b/attract/manage.py
index a7549240..e2bb7626 100644
--- a/attract/manage.py
+++ b/attract/manage.py
@@ -133,13 +133,13 @@ def populate_node_types(old_ids={}):
                     "users": {
                         "type": "list",
                         "schema": {
-                            "type": "string",
+                            "type": "objectid",
                         }
                     },
                     "groups": {
                         "type": "list",
                         "schema": {
-                            "type": "string",
+                            "type": "objectid",
                         }
                     }
                 }
@@ -174,7 +174,9 @@ def populate_node_types(old_ids={}):
             "status": {},
             "owners": {
                 "schema": {
-                    "users":{},
+                    "users":{
+                        "items": ['User'],
+                    },
                     "groups":{}
                 }
             },