fix admin stuff

Author: gassc

core/admin.py

@@ -113,6 +113,10 @@ class AdminUserView(ModelView):
 
     # Don't display the password on the list of Users
     column_exclude_list = list = ('password',)
+    column_list = ('email', 'roles', 'active')
+    column_formatters = {
+        'roles': lambda v, c, m, n: ",".join([i.name for i in m.roles])
+    }
     # Don't include the standard password field when creating or editing a User
     # (but see below)
     form_excluded_columns = ('password',)

core/models.py

@@ -135,7 +135,7 @@ class User(db.Model, UserMixin):
     active = db.Column(db.Boolean(), default=False)
     confirmed_at = db.Column(db.DateTime())
 
-    def __init__(self, email=None, password=None, roles=['contributor'], active=False): #, username=None, twitter=None, ):
+    def __init__(self, email=None, password=None, roles=[Role('contributor')], active=False): #, username=None, twitter=None, ):
         self.email = email
         self.password = password
         self.roles = roles