user = osmutils.get_user(request)
client = Client()
result = client.user_list(user.get_token())
+ result_projects = client.project_list(user.get_token())
+ p_map = {'admin': 'admin'}
+ for p in result_projects['data']:
+ p_map[p['_id']] = p['name']
+ users = result['data'] if result and result['error'] is False else []
+ for user in users:
+ user_project_ids = user['projects']
+ user_project_names = []
+ for p_id in user_project_ids:
+ if p_id in p_map:
+ user_project_names.append(p_map[p_id])
+ user['projects'] = user_project_names
+
result = {
'users': result['data'] if result and result['error'] is False else []
}
+
return __response_handler(request, result, 'user_list.html')
"password": request.POST['password'],
"projects": request.POST.getlist('projects')
}
-
result = client.user_create(user.get_token(), user_data)
-
- return __response_handler(request, result, 'users:list', to_redirect=True)
+ if result['error']:
+ return __response_handler(request, result['data'], url=None,
+ status=result['data']['status'] if 'status' in result['data'] else 500)
+ else:
+ return __response_handler(request, {}, url=None, status=200)
@login_required
user = osmutils.get_user(request)
try:
client = Client()
- del_res = client.user_delete(user.get_token(), user_id)
+ result = client.user_delete(user.get_token(), user_id)
except Exception as e:
log.exception(e)
- return __response_handler(request, {}, 'users:list', to_redirect=True, )
+ result = {'error': True, 'data': str(e)}
+ if result['error']:
+ return __response_handler(request, result['data'], url=None,
+ status=result['data']['status'] if 'status' in result['data'] else 500)
+ else:
+ return __response_handler(request, {}, url=None, status=200)
@login_required
def update(request, user_id=None):