github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 紧急修复url解析失败错误

pull/530/head
ibuler 2017-01-10 18:03:00 +08:00
parent 8658675f67
commit 8916221bba
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/templates/assets/asset_detail.html
View File

@ -306,7 +306,7 @@ function updateAssetGroups(groups) {
} }
function updateAssetSystem(system_users) { 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 = { var body = {
system_users: Object.assign([], system_users) system_users: Object.assign([], system_users)
}; };

18
apps/users/api.py
View File

@ -92,16 +92,20 @@ class UserToken(APIView):
permission_classes = (AllowAny,) permission_classes = (AllowAny,)
def post(self, request): def post(self, request):
username = request.data.get('username', '') if not request.user:
email = request.data.get('email', '') username = request.data.get('username', '')
password = request.data.get('password', '') email = request.data.get('email', '')
public_key = request.data.get('public_key', '') password = request.data.get('password', '')
public_key = request.data.get('public_key', '')
user, msg = check_user_valid(username=username, email=email, user, msg = check_user_valid(username=username, email=email,
password=password, public_key=public_key) password=password, public_key=public_key)
else:
user = request.user
msg = None
if user: if user:
token = generate_token(request, user) token = generate_token(request, user)
return Response({'Token': token, 'key': 'Bearer'}, status=200) return Response({'Token': token, 'Keyword': 'Bearer'}, status=200)
else: else:
return Response({'error': msg}, status=406) return Response({'error': msg}, status=406)

2
requirements.txt
View File

@ -17,5 +17,5 @@ requests==2.11.1
itsdangerous==0.24 itsdangerous==0.24
#python-gssapi==0.6.4 #python-gssapi==0.6.4
tornado==4.4.2 tornado==4.4.2
eventlet==0.19.0 eventlet==0.20.1
django-filter==1.0.0 django-filter==1.0.0