diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index 18f05e39c2bef596e7228983c9f5f96fbb9f68a0..3a1975a9a4de70539d67f0d3ae316243b25dc073 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -306,7 +306,7 @@ function updateAssetGroups(groups) { } function updateAssetSystem(system_users) { - var the_url = "{% url 'api-assets:asset-update-systemusers' pk=asset.id %}"; + var the_url = "{% url 'api-assets:asset-update-system-users' pk=asset.id %}"; var body = { system_users: Object.assign([], system_users) }; diff --git a/apps/users/api.py b/apps/users/api.py index f5d72b57fd35321fc18620bbb2ac4b1666a96d2f..a6c2c24b59ffc31d47dff82e541f2f38b2eb16d6 100644 --- a/apps/users/api.py +++ b/apps/users/api.py @@ -92,16 +92,20 @@ class UserToken(APIView): permission_classes = (AllowAny,) def post(self, request): - username = request.data.get('username', '') - email = request.data.get('email', '') - password = request.data.get('password', '') - public_key = request.data.get('public_key', '') - - user, msg = check_user_valid(username=username, email=email, - password=password, public_key=public_key) + if not request.user: + username = request.data.get('username', '') + email = request.data.get('email', '') + password = request.data.get('password', '') + public_key = request.data.get('public_key', '') + + user, msg = check_user_valid(username=username, email=email, + password=password, public_key=public_key) + else: + user = request.user + msg = None if user: token = generate_token(request, user) - return Response({'Token': token, 'key': 'Bearer'}, status=200) + return Response({'Token': token, 'Keyword': 'Bearer'}, status=200) else: return Response({'error': msg}, status=406) diff --git a/requirements.txt b/requirements.txt index b26a583c1a3275d9875e8656ee898482d2846cf1..e3700f963e60e0e596f1274677b0146c4aa9019b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,5 +17,5 @@ requests==2.11.1 itsdangerous==0.24 #python-gssapi==0.6.4 tornado==4.4.2 -eventlet==0.19.0 +eventlet==0.20.1 django-filter==1.0.0