From 8916221bba752db78daa9fb6ddc22fea4ab58d27 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 10 Jan 2017 18:03:00 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E7=B4=A7=E6=80=A5=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?url=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/templates/assets/asset_detail.html |  2 +-
 apps/users/api.py                             | 20 +++++++++++--------
 requirements.txt                              |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html
index 18f05e39c..3a1975a9a 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 f5d72b57f..a6c2c24b5 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 b26a583c1..e3700f963 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
-- 
GitLab