From b3444d2398de933de9f25b65085c5c0601b5f670 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Sat, 10 Jan 2015 14:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 juser/views.py                |  2 +-
 templates/juser/user_add.html | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/juser/views.py b/juser/views.py
index 21174962d..6802616fb 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -58,7 +58,7 @@ def user_list(request):
 def db_add_user(**kwargs):
     user = User(**kwargs)
     group_select = []
-    for group_id in groups:
+    for group_id in kwargs.get('groups', None):
         group = UserGroup.objects.filter(id=group_id)
         group_select.extend(group)
     user.user_group = group_select
diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html
index 5bd387430..7d571b859 100644
--- a/templates/juser/user_add.html
+++ b/templates/juser/user_add.html
@@ -50,7 +50,7 @@
                                 <div class="col-sm-8">
                                     <input id="j_ssh_key_pwd1" name="j_ssh_key_pwd1" placeholder="SSH Key Password" type="password" class="form-control">
                                     <span class="help-block m-b-none">
-                                        登陆Jumpserver Terminal 使用SSH密钥的密码
+                                        登陆 Jumpserver 使用的SSH密钥的密码
                                     </span>
                                 </div>
                             </div>
@@ -62,13 +62,6 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="j_email" class="col-sm-2 control-label">Email</label>
-                                <div class="col-sm-8">
-                                    <input id="j_email" name="j_email" type="email" placeholder="Email" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
                             <div class="form-group">
                                 <label for="j_group" class="col-lg-2 control-label">属组<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
@@ -105,6 +98,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
+                            <div class="form-group">
+                                <label for="j_email" class="col-sm-2 control-label">Email</label>
+                                <div class="col-sm-8">
+                                    <input id="j_email" name="j_email" type="email" placeholder="Email" class="form-control">
+                                </div>
+                            </div>
+                            <div class="hr-line-dashed"></div>
                             <div class="form-group"><label class="col-sm-2 control-label">是否启用</label>
 
                                 <div class="col-sm-8">