查找更新

plugins/csvn/index.py

@@ -183,7 +183,7 @@ def userDel():
     return 'fail'
 
 
-def getAllUser():
+def getAllUser(search=''):
     svn_auth_file = getServerDir() + '/data/conf/svn_auth_file'
     if not os.path.exists(svn_auth_file):
         return public.getJson([])
@@ -194,7 +194,11 @@ def getAllUser():
     ulist = []
     for x in range(len(auth_list)):
         tmp = auth_list[x].split(':')
-        ulist.append(tmp[0])
+        if search != '':
+            if tmp[0].find(search) != -1:
+                ulist.append(tmp[0])
+        else:
+            ulist.append(tmp[0])
     return ulist
 
 
@@ -204,13 +208,17 @@ def userList():
 
     page = 1
     page_size = 10
+    search = ''
     if 'page' in args:
         page = int(args['page'])
 
     if 'page_size' in args:
         page_size = int(args['page_size'])
 
-    ulist = getAllUser()
+    if 'search' in args:
+        search = args['search']
+
+    ulist = getAllUser(search)
     ulist_sum = len(ulist)
 
     page_info = {'count': ulist_sum, 'p': page,

plugins/csvn/js/csvn.js

@@ -15,22 +15,34 @@ function csvnPost(method,args,callback){
     },'json'); 
 }
 
-function csvnUserList(page) {
-    
-    if (typeof(page) =='undefined'){
-        page = 1;
+function csvnUserFind(){
+    var search = $('#csvn_find_user').val();
+    if (search==''){
+        layer.msg('搜索字符不能为空!',{icon:0,time:2000,shade: [0.3, '#000']});
+        return;
     }
+    csvnUserList(1, search);
+}
 
+function csvnUserList(page, search) {
+    
     var _data = {};
+    if (typeof(page) =='undefined'){
+        var page = 1;
+    }
+    
     _data['page'] = page;
     _data['page_size'] = 10;
+    if(typeof(search) != 'undefined'){
+        _data['search'] = search;
+    }
 
     csvnPost('user_list', _data, function(data){
 
         var rdata = $.parseJSON(data.data);
         // console.log(rdata);
-        content = '<div class="finduser"><input class="bt-input-text mr5 outline_no" type="text" placeholder="查找用户名" id="find_user" style="height: 28px; border-radius: 3px;width: 505px;">';
-        content += '<button class="btn btn-success btn-sm">查找</button></div>';
+        content = '<div class="finduser"><input class="bt-input-text mr5 outline_no" type="text" placeholder="查找用户名" id="csvn_find_user" style="height: 28px; border-radius: 3px;width: 505px;">';
+        content += '<button class="btn btn-success btn-sm" onclick="csvnUserFind();">查找</button></div>';
 
         content += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
         content += '<thead><tr>';