From 73f94fecb5a91d7d3bf0f721dc0298af738e55df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=BF=E5=AE=8F=E4=BC=9F?= <hongweiguang@huangbaoche.com>
Date: Thu, 29 Oct 2015 12:01:03 +0800
Subject: [PATCH] fix import some bug

---
 jumpserver/api.py   | 2 +-
 jumpserver/views.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jumpserver/api.py b/jumpserver/api.py
index 704ca3904..9d0ab1c23 100644
--- a/jumpserver/api.py
+++ b/jumpserver/api.py
@@ -10,7 +10,7 @@ import random
 import subprocess
 import paramiko
 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.http import HttpResponse, Http404
diff --git a/jumpserver/views.py b/jumpserver/views.py
index d28a1eb72..7df2409b8 100644
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -198,6 +198,7 @@ def is_latest():
 
 def Login(request):
     """登录界面"""
+    error = ''
     if request.user.is_authenticated():
         return HttpResponseRedirect('/')
     if request.method == 'GET':
@@ -229,8 +230,8 @@ def Login(request):
                 # response.set_cookie('username', username, expires=604800)
                 # response.set_cookie('seed', PyCrypt.md5_crypt(password), expires=604800)
                 # return response
-            # else:
-            #     error = '密码错误，请重新输入。'
+            else:
+                error = '密码错误，请重新输入。'
         else:
             error = '用户名或密码错误'
     return render_to_response('login.html', {'error': error})