From 8b91d5774f0958af545f0efe1c43485033a71944 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Sat, 10 Jan 2015 15:15:49 +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                 | 22 ++++++++++-----------
 templates/juser/group_add.html |  8 ++++----
 templates/juser/user_add.html  | 36 +++++++++++++++++-----------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/juser/views.py b/juser/views.py
index 6802616fb..554274430 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -13,8 +13,8 @@ def group_add(request):
     error = ''
     msg = ''
     if request.method == 'POST':
-        group_name = request.POST.get('j_group_name', None)
-        comment = request.POST.get('j_comment', None)
+        group_name = request.POST.get('group_name', None)
+        comment = request.POST.get('comment', None)
 
         try:
             if not group_name:
@@ -77,15 +77,15 @@ def user_add(request):
     user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'}
     all_group = UserGroup.objects.all()
     if request.method == 'POST':
-        username = request.POST.get('j_username', None)
-        password = request.POST.get('j_password', None)
-        name = request.POST.get('j_name', None)
-        email = request.POST.get('j_email', '')
-        groups = request.POST.getlist('j_group', None)
-        role = request.POST.get('j_role', None)
-        ssh_pwd = request.POST.get('j_ssh_pwd', None)
-        ssh_key_pwd1 = request.POST.get('j_ssh_key_pwd1', None)
-        is_active = request.POST.get('j_is_active', None)
+        username = request.POST.get('username', None)
+        password = request.POST.get('password', None)
+        name = request.POST.get('name', None)
+        email = request.POST.get('email', '')
+        groups = request.POST.getlist('groups', None)
+        role = request.POST.get('role', None)
+        ssh_pwd = request.POST.get('ssh_pwd', None)
+        ssh_key_pwd1 = request.POST.get('ssh_key_pwd1', None)
+        is_active = request.POST.get('is_active', '1')
 
         try:
             if None in [username, password, ssh_key_pwd1, name, groups, role, is_active]:
diff --git a/templates/juser/group_add.html b/templates/juser/group_add.html
index 11bd489f0..da5481b35 100644
--- a/templates/juser/group_add.html
+++ b/templates/juser/group_add.html
@@ -35,16 +35,16 @@
                                 <div class="alert alert-success text-center">{{ msg }}</div>
                             {% endif %}
                             <div class="form-group">
-                                <label for="j_group_name" class="col-sm-2 control-label">组名<span class="red-fonts">*</span></label>
+                                <label for="group_name" class="col-sm-2 control-label">组名<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <input id="j_group_name" name="j_group_name" placeholder="Group name" type="text" class="form-control">
+                                    <input id="group_name" name="group_name" placeholder="Group name" type="text" class="form-control">
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_comment" class="col-sm-2 control-label">备注</label>
+                                <label for="comment" class="col-sm-2 control-label">备注</label>
                                 <div class="col-sm-8">
-                                    <input id="j_comment" name="j_comment" placeholder="Comment" type="text" class="form-control">
+                                    <input id="comment" name="comment" placeholder="Comment" type="text" class="form-control">
                                 </div>
                             </div>
 
diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html
index 72048a182..01430bbfe 100644
--- a/templates/juser/user_add.html
+++ b/templates/juser/user_add.html
@@ -35,16 +35,16 @@
                                 <div class="alert alert-success text-center">{{ msg }}</div>
                             {% endif %}
                             <div class="form-group">
-                                <label for="j_username" class="col-sm-2 control-label">用户名<span class="red-fonts">*</span></label>
+                                <label for="username" class="col-sm-2 control-label">用户名<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <input id="j_username" name="j_username" placeholder="Username" type="text" class="form-control">
+                                    <input id="username" name="username" placeholder="Username" type="text" class="form-control">
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_password" class="col-sm-2 control-label">密码<span class="red-fonts">*</span></label>
+                                <label for="password" class="col-sm-2 control-label">密码<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <input id="j_password" name="j_password" placeholder="Password" type="password" class="form-control">
+                                    <input id="password" name="password" placeholder="Password" type="password" class="form-control">
                                     <span class="help-block m-b-none">
                                         登陆web的密码
                                     </span>
@@ -52,9 +52,9 @@
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_ssh_key_pwd1" class="col-sm-2 control-label">密钥密码<span class="red-fonts">*</span></label>
+                                <label for="ssh_key_pwd1" class="col-sm-2 control-label">密钥密码<span class="red-fonts">*</span></label>
                                 <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">
+                                    <input id="ssh_key_pwd1" name="ssh_key_pwd1" placeholder="SSH Key Password" type="password" class="form-control">
                                     <span class="help-block m-b-none">
                                         登陆 Jumpserver 使用的SSH密钥的密码
                                     </span>
@@ -62,16 +62,16 @@
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_name" class="col-sm-2 control-label">姓名<span class="red-fonts">*</span></label>
+                                <label for="name" class="col-sm-2 control-label">姓名<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <input id="j_name" name="j_name" placeholder="Name" type="text" class="form-control" >
+                                    <input id="name" name="name" placeholder="Name" type="text" 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>
+                                <label for="groups" class="col-lg-2 control-label">属组<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <select id="j_group" name="j_group" class="form-control m-b" multiple>
+                                    <select id="groups" name="groups" class="form-control m-b" multiple>
                                         {% for group in all_group %}
                                             {% if forloop.first %}
                                                 <option value="{{ group.id }}" selected>{{ group.name }}</option>
@@ -84,9 +84,9 @@
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_role" class="col-lg-2 control-label">角色<span class="red-fonts">*</span></label>
+                                <label for="role" class="col-lg-2 control-label">角色<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <select id="j_role" name="j_role" class="form-control m-b">
+                                    <select id="role" name="role" class="form-control m-b">
                                         {% for r, role in roles.items %}
                                             <option value="{{ r }}">{{ role }}</option>
                                         {% endfor %}
@@ -95,9 +95,9 @@
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_ssh_pwd" class="col-sm-2 control-label">SSH密码</label>
+                                <label for="ssh_pwd" class="col-sm-2 control-label">SSH密码</label>
                                 <div class="col-sm-8">
-                                    <input id="j_ssh_pwd" name="j_ssh_pwd" type="password" placeholder="SSH Password" class="form-control">
+                                    <input id="ssh_pwd" name="ssh_pwd" type="password" placeholder="SSH Password" class="form-control">
                                     <span class="help-block m-b-none">
                                         如果使用password方式，该密码是用户在后端服务器的密码
                                     </span>
@@ -105,9 +105,9 @@
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="j_email" class="col-sm-2 control-label">Email</label>
+                                <label for="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">
+                                    <input id="email" name="email" type="email" placeholder="Email" class="form-control">
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
@@ -115,10 +115,10 @@
 
                                 <div class="col-sm-8">
                                     <div class="radio i-checks">
-                                        <label><input type="radio" value="1" name="j_is_active" checked>启用 </label>
+                                        <label><input type="radio" value="1" name="is_active" checked>启用 </label>
                                     </div>
                                     <div class="radio i-checks">
-                                        <label><input type="radio" value="0" name="j_is_active">禁用 </label>
+                                        <label><input type="radio" value="0" name="is_active">禁用 </label>
                                     </div>
                                 </div>
                             </div>