From 16a2d3803a5324805a47c8fa3bea87f8db5e1a28 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Mon, 29 Sep 2014 15:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=87=EE=86=BD=E6=95=BCchgUser.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/AutoSa/AutoSa/views.py        | 13 +++++--
 webroot/AutoSa/templates/chgUser.html | 51 ++++++++++++---------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index eea82998e..7734cf663 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -466,14 +466,23 @@ def chgUser(request):
     """修改用户信息"""
     error = ''
     msg = ''
-    form = UserAddForm()
     jm = PyCrypt(key)
 
     if request.method == "GET":
         username = request.GET.get('username')
         user = User.objects.get(username=username)
+        groups = user.group.all()
+        if user.is_admin:
+            is_admin = "checked"
+        else:
+            is_admin = ''
+        if user.is_superuser:
+            is_superuser = "checked"
+        else:
+            is_superuser = ''
         return render_to_response('chgUser.html',
-                                  {'user': user, 'user_menu': 'active', 'form': form},
+                                  {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
+                                   'is_superuser': is_superuser, 'groups': groups},
                                   context_instance=RequestContext(request))
     else:
         form = UserAddForm(request.POST)
diff --git a/webroot/AutoSa/templates/chgUser.html b/webroot/AutoSa/templates/chgUser.html
index 3e90e8adb..e1a6f8407 100644
--- a/webroot/AutoSa/templates/chgUser.html
+++ b/webroot/AutoSa/templates/chgUser.html
@@ -23,67 +23,62 @@
             <div class="form-group">
                 <label for="id_username" class="col-sm-2 control-label">用户名<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="text" id="id_username" name="username" class="form-control" value="{{ user.username }}" disabled="disabled" >
+                    <input type="text" id="username" name="username" class="form-control" value="{{ user.username }}" disabled="disabled" >
                 </div>
             </div>
             <div class="form-group">
-                {{ form.password.errors }}
-                <label for="id_password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
+                <label for="password" class="col-sm-2 control-label">密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    {{ form.password }}
+                    <input type="password" id="password" name="password" class="form-control" value="{{ user.password }}" >
                 </div>
             </div>
             <div class="form-group">
-                {{ form.password_again.errors }}
-                <label for="id_password_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
+                <label for="password_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    {{ form.password_again }}
+                    <input type="password" id="password_again" name="password_again" class="form-control" value="{{ user.password }}" >
                 </div>
             </div>
             <div class="form-group">
-                {{ form.key_pass.errors }}
-                <label for="id_keypass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
+                <label for="keypass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    {{ form.key_pass }}
+                    <input type="password" id="keypass" name="keypass" class="form-control" value="{{ user.keypass }}" >
                 </div>
             </div>
             <div class="form-group">
-                {{ form.key_pass_again.errors }}
-                <label for="id_keypass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
+                <label for="keypass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    {{ form.key_pass_again }}
+                    <input type="password" id="keypass_again" name="keypass_again" class="form-control" value="{{ user.keypass }}" >
                 </div>
             </div>
             <div class="form-group">
-                {{ form.name.errors }}
-                <label for="id_name" class="col-sm-2 control-label">姓名<span style="color: red"> *</span></label>
+                <label for="name" class="col-sm-2 control-label">姓名<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    {{ form.name }}
-                    {{ user.name }}
+                    <input type="password" id="name" name="name" class="form-control" value="{{ user.name }}" >
                 </div>
             </div>
             <div class="form-group">
-                {{ form.group.errors }}
-                <label for="id_group" class="col-sm-2 control-label">属组<span style="color: red"> *</span></label>
+                <label for="group" class="col-sm-2 control-label">属组<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    {{ form.group }}
+                    <select multiple name="group" id="group">
+                        {% for group in groups %}
+                        <option value="{{ group.name }}" >{{ group.name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
                 </div>
             </div>
             <div class="form-group">
-                {{ form.is_admin.errors }}
-                <label for="id_is_admin" class="col-sm-2 control-label">组admin</label>
+                <label for="is_admin" class="col-sm-2 control-label">组admin</label>
                 <div class="col-sm-4">
-                    {{ form.is_admin }}
-                    {{ user.is_admin }}
+                    <input type="checkbox" name="is_admin" id="is_admin" value="{{ is_admin }}">
                 </div>
             </div>
             <div class="form-group">
-                {{ form.is_superuser.errors }}
-                <label for="id_is_superuser" class="col-sm-2 control-label">超级admin</label>
+                <label for="is_superuser" class="col-sm-2 control-label">超级admin</label>
                 <div class="col-sm-4">
-                    {{ form.is_superuser }}
-                    {{ user.is_superuser }}
+                    <input type="checkbox" name="is_superuser" id="is_superuser" value="{{ is_superuser }}">
                 </div>
+
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-4">