archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

sync_project_groups: also support identifying user by user ID

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-06 12:55:40 +02:00
parent 2be94bd504
commit 51a51e5782
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pillar/manage.py
View File

@ -957,8 +957,17 @@ def sync_project_groups(user_email, fix):
proj_coll = app.data.driver.db['projects'] proj_coll = app.data.driver.db['projects']
groups_coll = app.data.driver.db['groups'] groups_coll = app.data.driver.db['groups']
user = users_coll.find_one({'email': user_email}, projection={'_id': 1, # Find by email or by user ID
'groups': 1}) if '@' in user_email:
where = {'email': user_email}
else:
where = {'_id': ObjectId(user_email)}
user = users_coll.find_one(where, projection={'_id': 1, 'groups': 1})
if user is None:
log.error('User %s not found', where)
raise SystemExit()
user_groups = set(user['groups']) user_groups = set(user['groups'])
user_id = user['_id'] user_id = user['_id']
log.info('Updating projects for user %s', user_id) log.info('Updating projects for user %s', user_id)