From 6897d063c28629ff129f91f334315c60ea052aa0 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Sat, 7 Nov 2015 09:09:36 +0800
Subject: [PATCH] =?UTF-8?q?error=20=3D=20'=E7=94=A8=E6=88=B7=E6=9C=AA?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jumpserver/views.py b/jumpserver/views.py
index d476e95c3..1266d576b 100644
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -227,6 +227,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: