From 95e8115045b4e8914e66f1e927055b529942772a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 7 Dec 2015 23:29:19 +0800
Subject: [PATCH] bug fix

---
 juser/views.py                      | 2 +-
 templates/jperm/perm_rule_list.html | 1 -
 templates/nav.html                  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/juser/views.py b/juser/views.py
index cc18d7e9a..fd42cd662 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -147,7 +147,7 @@ def user_add(request):
         groups = request.POST.getlist('groups', [])
         admin_groups = request.POST.getlist('admin_groups', [])
         role = request.POST.get('role', 'CU')
-        uuid_r = uuid.uuid1()
+        uuid_r = uuid.uuid4().get_hex()
         ssh_key_pwd = PyCrypt.gen_rand_pass(16)
         extra = request.POST.getlist('extra', [])
         is_active = False if '0' in extra else True
diff --git a/templates/jperm/perm_rule_list.html b/templates/jperm/perm_rule_list.html
index 8077a3842..11c40fbf6 100644
--- a/templates/jperm/perm_rule_list.html
+++ b/templates/jperm/perm_rule_list.html
@@ -35,7 +35,6 @@
                 <div class="ibox-content">
                     <div class="">
                     <a href="/jperm/perm_rule_add/" class="btn btn-sm btn-primary "> 添加规则 </a>
-                    <a id="del_btn" class="btn btn-sm btn-danger "> 删除所选 </a>
                     <form id="search_form" method="get" action="" class="pull-right mail-search">
                         <div class="input-group">
                             <input type="text" class="form-control input-sm" id="search_input" name="search" placeholder="Search">
diff --git a/templates/nav.html b/templates/nav.html
index 6611f0fcc..cbe70db7c 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -24,7 +24,7 @@
             <li id="jperm">
                 <a href="#"><i class="fa fa-edit"></i> <span class="nav-label">授权管理</span><span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
-                    <li class="rule perm_rule_add">
+                    <li class="rule perm_rule_add perm_rule_detail">
                         <a href="/jperm/rule/">授权规则</a>
                     </li>
                     <li class="role">