From 49dcdf3be072a93f068829589c1de6651524f0f9 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 23 Jan 2015 00:41:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 juser/urls.py                  |  1 +
 juser/views.py                 | 21 +++++++++++++++++++++
 templates/footer.html          |  2 +-
 templates/juser/user_list.html |  2 +-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/juser/urls.py b/juser/urls.py
index 33b5a60d0..3712b517f 100644
--- a/juser/urls.py
+++ b/juser/urls.py
@@ -12,4 +12,5 @@ urlpatterns = patterns('juser.views',
     (r'^group_list/$', 'group_list'),
     (r'^user_detail/$', 'user_detail'),
     (r'^user_del/$', 'user_del'),
+    (r'^user_edit/$', 'user_edit'),
 )
diff --git a/juser/views.py b/juser/views.py
index 7e5ae94ec..67d0c8ef2 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -187,6 +187,27 @@ def user_del(request):
     return HttpResponseRedirect('/juser/user_list/', locals())
 
 
+def user_edit(request):
+    if request.method == 'GET':
+        username = request.GET.get('username', None)
+        if not username:
+            return HttpResponseRedirect('/')
+        user = User.objects.get(username=username)
+        username = user.username
+        password = user.password
+        ssh_key_pwd1 = user.ssh_key_pwd1
+        name = user.name
+        all_group = UserGroup.objects.all()
+        groups = user.user_group.all()
+        groups_str = ' '.join([group.name for group in groups])
+        user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'}
+        role_post = user.role
+        ssh_pwd = user.ssh_pwd
+        email = user.email
+
+        return render_to_response('juser/user_add.html', locals())
+
+
 def db_add_user(**kwargs):
     groups_post = kwargs.pop('groups')
     user = User(**kwargs)
diff --git a/templates/footer.html b/templates/footer.html
index eeff7cd3c..3574f1c9e 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,6 +1,6 @@
 <div class="footer fixed">
     <div class="pull-right">
-        Version <strong>2.2.0</strong> GPL.
+        Version <strong>1.2.0</strong> GPL.
     </div>
     <div>
         <strong>Copyright</strong> Jumpserver.org Organization &copy; 2014-2015
diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html
index 7e8a7ba5a..8c69ec253 100644
--- a/templates/juser/user_list.html
+++ b/templates/juser/user_list.html
@@ -59,7 +59,7 @@
                                 <td class="text-center">{{ user.email }}</td>
                                 <td class="text-center">{{ user.is_active|bool2str }}</td>
                                 <td class="text-center">
-                                    <a href="../user_detail/?username={{ user.username }}/" class="iframe btn btn-xs btn-primary">详情</a>
+                                    <a href="../user_detail/?username={{ user.username }}" class="iframe btn btn-xs btn-primary">详情</a>
                                     <a href="../user_edit/?username={{ user.username }}" class="btn btn-xs btn-info">编辑</a>
                                     <a href="../user_del/?username={{ user.username }}" class="btn btn-xs btn-danger">删除</a>
                                 </td>