From 333ee713d4166b4c55ce743aa42cea0003e07118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=BF=E5=AE=8F=E4=BC=9F?= <hongweiguang@huangbaoche.com>
Date: Sun, 15 Nov 2015 18:20:34 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=A1=B5bug?=
 =?UTF-8?q?=EF=BC=8C=E5=92=8Crandom=5Fpass?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/api.py        |  2 +-
 juser/user_api.py        |  2 +-
 juser/views.py           |  9 +++------
 templates/paginator.html | 10 +++++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jumpserver/api.py b/jumpserver/api.py
index d81a6eecd..5b964586c 100644
--- a/jumpserver/api.py
+++ b/jumpserver/api.py
@@ -414,4 +414,4 @@ def my_render(template, data, request):
 
 CRYPTOR = PyCrypt(KEY)
 logger = set_log(LOG_LEVEL)
-
+KEY_DIR = os.path.join(BASE_DIR, 'keys')
diff --git a/juser/user_api.py b/juser/user_api.py
index 4780fb689..434994c9a 100644
--- a/juser/user_api.py
+++ b/juser/user_api.py
@@ -119,7 +119,7 @@ def db_del_user(username):
 
 
 def gen_ssh_key(username, password='',
-                key_dir=os.path.join(BASE_DIR, 'keys/user/'),
+                key_dir=os.path.join(KEY_DIR, 'user'),
                 authorized_keys=True, home="/home", length=2048):
     """
     generate a user ssh key in a property dir
diff --git a/juser/views.py b/juser/views.py
index cef677a96..21a6e8216 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -151,14 +151,14 @@ def user_add(request):
 
     if request.method == 'POST':
         username = request.POST.get('username', '')
-        password = PyCrypt.random_pass(16)
+        password = PyCrypt.gen_rand_pass(16)
         name = request.POST.get('name', '')
         email = request.POST.get('email', '')
         groups = request.POST.getlist('groups', [])
         admin_groups = request.POST.getlist('admin_groups', [])
         role = request.POST.get('role', 'CU')
         uuid = uuid_r.uuid1()
-        ssh_key_pwd = PyCrypt.random_pass(16)
+        ssh_key_pwd = PyCrypt.gen_rand_pass(16)
         extra = request.POST.getlist('extra', [])
         is_active = True if '0' in extra else False
         ssh_key_login_need = True if '1' in extra else False
@@ -191,14 +191,11 @@ def user_add(request):
                     for user_group_id in groups:
                         user_groups.extend(UserGroup.objects.filter(id=user_group_id))
                     print user_groups
-                    results = _public_perm_api({'type': 'new_user', 'user': user, 'group': user_groups})
-                    print results
             except IndexError, e:
                 error = u'添加用户 %s 失败 %s ' % (username, e)
                 try:
                     db_del_user(username)
                     server_del_user(username)
-                    _public_perm_api({'type': 'del_user', 'user': user, 'group': user_groups})
                 except Exception:
                     pass
             else:
@@ -463,7 +460,7 @@ def regen_ssh_key(request):
         return HttpResponse('没有该用户')
 
     username = user.username
-    ssh_key_pass = PyCrypt.random_pass(16)
+    ssh_key_pass = PyCrypt.gen_rand_pass(16)
     gen_ssh_key(username, ssh_key_pass)
     return HttpResponse('ssh密钥已生成，密码为 %s, 请到下载页面下载' % ssh_key_pass)
 
diff --git a/templates/paginator.html b/templates/paginator.html
index 63344fc4a..6ce7d6f23 100644
--- a/templates/paginator.html
+++ b/templates/paginator.html
@@ -36,18 +36,22 @@
     </div>
 </div>
 <script>
+    function sleep(n) { //n表示的毫秒数
+            var start = new Date().getTime();
+            while (true) if (new Date().getTime() - start > n) break;
+        }
+
     $(document).ready(function(){
         $('.page').click(function(){
             var searchStr = location.search;
             var old_href = $(this).attr('href').replace('?', '');
             var searchArray = searchStr.split('&');
 
-            if (searchStr.indexOf('page')){
+            if (searchStr.indexOf('page')>=0){
                 searchArray.pop();
             }
             searchArray.push(old_href);
-
-            if (searchArray.length > 2){
+            if (searchArray.length > 1){
                 $(this).attr('href', searchArray.join('&'));
             }
         })

From 38c65dbea889cbec400f61073557b37e66ca6f3e Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 15 Nov 2015 23:19:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E7=9A=84get.asset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jumpserver/views.py b/jumpserver/views.py
index 00f709ffd..aec46a2a5 100644
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -80,7 +80,8 @@ def index_cu(request):
     user = get_object(User, id=user_id)
     login_types = {'L': 'LDAP', 'M': 'MAP'}
     username = user.username
-    posts = user.get_asset()
+    # posts = user.get_asset()
+    posts = User.objects.all()
     host_count = len(posts)
     new_posts = []
     post_five = []

From 5d33493233e98d3d0d9cbe5e0f01f9aac02777e4 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 15 Nov 2015 23:21:59 +0800
Subject: [PATCH 3/4] asset js

---
 templates/jasset/asset_add.html | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/templates/jasset/asset_add.html b/templates/jasset/asset_add.html
index 46ea10bfe..53d7dd0b2 100644
--- a/templates/jasset/asset_add.html
+++ b/templates/jasset/asset_add.html
@@ -126,34 +126,6 @@
         })
     });
 
-<<<<<<< HEAD
-$('document').ready(function(){
-    $('#use_default').click(function(){
-        if ($(this).is(':checked')){
-            $('#admin_account').css('display', 'none');
-            $('#port').css('display', 'none')
-        }
-        else {
-            $('#admin_account').css('display', 'block');
-            $('#port').css('display', 'block')
-        }
-    })
-});
-
-$('#assetForm').validator({
-    timely: 2,
-    theme: "yellow_right_effect",
-    rules: {
-        check_ip: [/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])(\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])){3}$/, 'ip地址不正确'],
-        check_port: [/^\d{1,5}$/, '端口号不正确'],
-    },
-    fields: {
-        "ip": {
-            rule: "required;check_ip",
-            tip: "输入IP",
-            ok: "",
-            msg: {required: "必须填写!"}
-=======
     var required_fields = ["id_hostname", "id_ip", "id_port"];
     required_fields.forEach(function(field) {
         $('label[for="' + field + '"]').parent().addClass("required");
@@ -182,7 +154,6 @@ $('#assetForm').validator({
         },
         valid: function(form) {
             form.submit();
->>>>>>> cmdb
         }
     });
 

From 1e41b796110762344b0181f3578ec96ab09bdde1 Mon Sep 17 00:00:00 2001
From: wangyong <864072399@qq.com>
Date: Sun, 15 Nov 2015 23:29:31 +0800
Subject: [PATCH 4/4] fix merge bug

---
 templates/jasset/asset_add.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/templates/jasset/asset_add.html b/templates/jasset/asset_add.html
index 53d7dd0b2..1d8eacc28 100644
--- a/templates/jasset/asset_add.html
+++ b/templates/jasset/asset_add.html
@@ -41,6 +41,7 @@
                                     {% endif %}
 
                                     <form id="assetForm" method="post" class="form-horizontal">
+
                                         {{ af.ip|bootstrap_horizontal }}
 
                                         <div class="hr-line-dashed"></div>
@@ -61,12 +62,6 @@
                                             </div>
                                         </div>
 
-                                        <div class="form-group" id="port" style="display: none">
-                                            <label class="col-sm-2 control-label"> 端口号<span class="red-fonts">*</span> </label>
-                                            <div class="col-sm-8">
-                                                <input type="text" placeholder="Port" name="port" class="form-control">
-                                            </div>
-                                        </div>
                                         <div class="form-group" id="admin_account" style="display: none">
                                             <label class="col-sm-2 control-label"> 管理用户名<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-3">