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

fix import some bug

pull/26/head
广宏伟 2015-10-29 12:01:03 +08:00
parent 0e24ebdb26
commit 73f94fecb5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jumpserver/api.py
View File

@ -10,7 +10,7 @@ import random
import subprocess import subprocess
import paramiko import paramiko
import struct, fcntl, signal, socket, select, fnmatch import struct, fcntl, signal, socket, select, fnmatch
from settings import JLOG_FILE, KEY, URL, log_dir, log_level from settings import *
from django.core.paginator import Paginator, EmptyPage, InvalidPage from django.core.paginator import Paginator, EmptyPage, InvalidPage
from django.http import HttpResponse, Http404 from django.http import HttpResponse, Http404

5
jumpserver/views.py
View File

@ -198,6 +198,7 @@ def is_latest():
def Login(request): def Login(request):
"""登录界面""" """登录界面"""
error = ''
if request.user.is_authenticated(): if request.user.is_authenticated():
return HttpResponseRedirect('/') return HttpResponseRedirect('/')
if request.method == 'GET': if request.method == 'GET':
@ -229,8 +230,8 @@ def Login(request):
# response.set_cookie('username', username, expires=604800) # response.set_cookie('username', username, expires=604800)
# response.set_cookie('seed', PyCrypt.md5_crypt(password), expires=604800) # response.set_cookie('seed', PyCrypt.md5_crypt(password), expires=604800)
# return response # return response
# else: else:
# error = '密码错误，请重新输入。' error = '密码错误，请重新输入。'
else: else:
error = '用户名或密码错误' error = '用户名或密码错误'
return render_to_response('login.html', {'error': error}) return render_to_response('login.html', {'error': error})