From 4b9cadf7db5cbe57dc8bf86a99282fc5d4e4241f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 13 Dec 2018 15:20:47 +0800
Subject: [PATCH] update

---
 plugins/csvn/index.py   | 17 +++++++++++++----
 plugins/csvn/js/csvn.js | 19 ++++++++++++++++---
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/plugins/csvn/index.py b/plugins/csvn/index.py
index 9f69e3105..37f3cf531 100755
--- a/plugins/csvn/index.py
+++ b/plugins/csvn/index.py
@@ -275,7 +275,7 @@ def getCsvnPort():
     return '3343'
 
 
-def getALlProjectList():
+def getALlProjectList(search=''):
     path = getServerDir() + '/data/repositories'
     dlist = []
     if os.path.exists(path):
@@ -283,8 +283,13 @@ def getALlProjectList():
             tmp = {}
             filePath = path + '/' + filename
             if os.path.isdir(filePath):
-                tmp['name'] = filename
-            dlist.append(tmp)
+                if search == '':
+                    tmp['name'] = filename
+                    dlist.append(tmp)
+                else:
+                    if filename.find(search) != -1:
+                        tmp['name'] = filename
+                        dlist.append(tmp)
     return dlist
 
 
@@ -294,13 +299,17 @@ def projectList():
 
     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'])
 
-    dlist = getALlProjectList()
+    if 'search' in args:
+        search = args['search']
+
+    dlist = getALlProjectList(search)
     data = {}
 
     dlist_sum = len(dlist)
diff --git a/plugins/csvn/js/csvn.js b/plugins/csvn/js/csvn.js
index 0befae5f2..624e4f5af 100755
--- a/plugins/csvn/js/csvn.js
+++ b/plugins/csvn/js/csvn.js
@@ -158,18 +158,31 @@ function csvnModPwdUser(name){
     csvnAddUser(name);
 }
 
-function csvnProjectList(page){
+function csvnProjectFind(){
+    var search = $('#csvn_project_find').val();
+    if (search == ''){
+         layer.msg('查找字符不能为空!',{icon:0,time:2000,shade: [0.3, '#000']});
+         return;
+    }
+
+    csvnProjectList(1, search);
+}
+
+function csvnProjectList(page, search){
     var _data = {};
     _data['page'] = page;
     _data['page_size'] = 10;
+    if (typeof(search) != 'undefined'){
+         _data['search'] = search;
+    }
 
     csvnPost('project_list', _data, function(data){
 
         var rdata = $.parseJSON($.trim(data.data));
         var csvn_mg = project_url = 'http://' +rdata['ip'] +(rdata['csvn_port'] == '80' ? '': ':'+rdata['csvn_port']);
 
-        content = '<div class="finduser"><input class="bt-input-text mr5" type="text" placeholder="查找项目" id="disable_function_val" style="height: 28px; border-radius: 3px;width: 505px;">';
-        content += '<button class="btn btn-success btn-sm">查找</button></div>';
+        content = '<div><input class="bt-input-text mr5" type="text" placeholder="查找项目" id="csvn_project_find" style="height: 28px; border-radius: 3px;width: 505px;">';
+        content += '<button class="btn btn-success btn-sm" onclick="csvnProjectFind();">查找</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>';