alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use IDs for document owner

Browse source
This commit is contained in:
Davide Alberani 2016-06-13 22:44:57 +02:00
parent ccda304533
commit 6781f06ebe
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
eventman_server.py
View file

@ -165,14 +165,16 @@ class BaseHandler(tornado.web.RequestHandler):
current_user = self.current_user current_user = self.current_user
if current_user in self._users_cache: if current_user in self._users_cache:
return self._users_cache[current_user] return self._users_cache[current_user]
user_info = {'permissions': set([k for (k, v) in self.permissions.iteritems() if v is True])} permissions = set([k for (k, v) in self.permissions.iteritems() if v is True])
user_info = {'permissions': permissions}
if current_user: if current_user:
user_info['username'] = current_user user_info['username'] = current_user
res = self.db.query('users', {'username': current_user}) res = self.db.query('users', {'username': current_user})
if res: if res:
user = res[0] user = res[0]
user_info['permissions'].update(set(user.get('permissions') or [])) user_info = user
user_info['permissions'] = list(user_info['permissions']) permissions.update(set(user.get('permissions') or []))
user_info['permissions'] = permissions
self._users_cache[current_user] = user_info self._users_cache[current_user] = user_info
return user_info return user_info
@ -377,11 +379,12 @@ class CollectionHandler(BaseHandler):
method = self.request.method.lower() method = self.request.method.lower()
crud_method = 'create' if method == 'post' else 'update' crud_method = 'create' if method == 'post' else 'update'
now = datetime.datetime.now() now = datetime.datetime.now()
current_user = self.current_user user_info = self.current_user_info
user_id = user_info.get('_id')
if crud_method == 'create': if crud_method == 'create':
data['created_by'] = current_user data['created_by'] = user_id
data['created_at'] = now data['created_at'] = now
data['updated_by'] = current_user data['updated_by'] = user_id
data['updated_at'] = now data['updated_at'] = now
if resource: if resource:
permission = '%s:%s%s|%s' % (self.document, resource, '-all' if resource_id is None else '', crud_method) permission = '%s:%s%s|%s' % (self.document, resource, '-all' if resource_id is None else '', crud_method)

2
utils.py
View file

@ -93,6 +93,8 @@ class ImprovedEncoder(json.JSONEncoder):
return str(o) return str(o)
except Exception, e: except Exception, e:
pass pass
elif isinstance(o, set):
return list(o)
return json.JSONEncoder.default(self, o) return json.JSONEncoder.default(self, o)