X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Fmodel.py;h=da6671676c58cb66ade991709b9a21ba2716e830;hb=128e779f261ec3ddfac4c92fabbc1e0cedca4bc2;hp=18029d10a6669facec15a21a0caeae3a29eeb96f;hpb=a499e55133403cf5ef2f35649105e525909b30a0;p=sfa.git

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 18029d10..da667167 100644
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -199,7 +199,9 @@ class RegUser (RegRecord):
     __mapper_args__     = { 'polymorphic_identity' : 'user' }
     record_id           = Column (Integer, ForeignKey ("records.record_id"), primary_key=True)
     email               = Column ('email', String)
-    keys                = relationship ('RegKey', backref='user')
+    # can't use name 'keys' here because when loading from xml we're getting
+    # a 'keys' tag, and assigning a list of strings in a reference column like this crashes
+    reg_keys                = relationship ('RegKey', backref='reg_user')
     
     def __init__ (self, **kwds):
         # handle local settings