X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=userhandler%2Fviews.py;h=b78d1ded182ddb2f56a804d6989b4257cb424842;hb=refs%2Ftags%2Fv8.0.2;hp=66fc22a6bab83f648e10b9231e20dc7592fd4987;hpb=5bc5ebbb3fe574a5699c580594808cee44a4e0b3;p=osm%2FLW-UI.git diff --git a/userhandler/views.py b/userhandler/views.py index 66fc22a..b78d1de 100644 --- a/userhandler/views.py +++ b/userhandler/views.py @@ -32,11 +32,10 @@ def user_list(request): client = Client() result = client.user_list(user.get_token()) - users = result['data'] if result and result['error'] is False else [] result = { 'users': result['data'] if result and result['error'] is False else [] } - + return __response_handler(request, result, 'user_list.html') @@ -44,11 +43,10 @@ def user_list(request): def create(request): user = osmutils.get_user(request) client = Client() - user_data ={ - "username": request.POST['username'], - "password": request.POST['password'] - } - + + new_user_dict = request.POST.dict() + keys = ["username", "password", "domain_name"] + user_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, new_user_dict.items())) result = client.user_create(user.get_token(), user_data) if result['error']: return __response_handler(request, result['data'], url=None, @@ -72,12 +70,13 @@ def delete(request, user_id=None): else: return __response_handler(request, {}, url=None, status=200) + @login_required def user_info(request, user_id=None): user = osmutils.get_user(request) try: client = Client() - + info_res = client.get_user_info(user.get_token(), user_id) except Exception as e: log.exception(e) @@ -88,6 +87,7 @@ def user_info(request, user_id=None): else: return __response_handler(request, info_res['data'], url=None, status=200) + @login_required def update(request, user_id=None): user = osmutils.get_user(request) @@ -107,7 +107,7 @@ def update(request, user_id=None): 'project': project, 'role': role_param_ip[i], }) - + update_res = client.user_update(user.get_token(), user_id, payload) except Exception as e: log.exception(e)