pull/109/head
Mr Chen 7 years ago
parent 89fa7db1c1
commit 4b9cadf7db
  1. 17
      plugins/csvn/index.py
  2. 19
      plugins/csvn/js/csvn.js

@ -275,7 +275,7 @@ def getCsvnPort():
return '3343' return '3343'
def getALlProjectList(): def getALlProjectList(search=''):
path = getServerDir() + '/data/repositories' path = getServerDir() + '/data/repositories'
dlist = [] dlist = []
if os.path.exists(path): if os.path.exists(path):
@ -283,8 +283,13 @@ def getALlProjectList():
tmp = {} tmp = {}
filePath = path + '/' + filename filePath = path + '/' + filename
if os.path.isdir(filePath): if os.path.isdir(filePath):
tmp['name'] = filename if search == '':
dlist.append(tmp) tmp['name'] = filename
dlist.append(tmp)
else:
if filename.find(search) != -1:
tmp['name'] = filename
dlist.append(tmp)
return dlist return dlist
@ -294,13 +299,17 @@ def projectList():
page = 1 page = 1
page_size = 10 page_size = 10
search = ''
if 'page' in args: if 'page' in args:
page = int(args['page']) page = int(args['page'])
if 'page_size' in args: if 'page_size' in args:
page_size = int(args['page_size']) page_size = int(args['page_size'])
dlist = getALlProjectList() if 'search' in args:
search = args['search']
dlist = getALlProjectList(search)
data = {} data = {}
dlist_sum = len(dlist) dlist_sum = len(dlist)

@ -158,18 +158,31 @@ function csvnModPwdUser(name){
csvnAddUser(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 = {}; var _data = {};
_data['page'] = page; _data['page'] = page;
_data['page_size'] = 10; _data['page_size'] = 10;
if (typeof(search) != 'undefined'){
_data['search'] = search;
}
csvnPost('project_list', _data, function(data){ csvnPost('project_list', _data, function(data){
var rdata = $.parseJSON($.trim(data.data)); var rdata = $.parseJSON($.trim(data.data));
var csvn_mg = project_url = 'http://' +rdata['ip'] +(rdata['csvn_port'] == '80' ? '': ':'+rdata['csvn_port']); 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 = '<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">查找</button></div>'; 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 += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
content += '<thead><tr>'; content += '<thead><tr>';

Loading…
Cancel
Save