diff --git a/plugins/csvn/index.html b/plugins/csvn/index.html index 7d5a8bf5b..dfa639405 100755 --- a/plugins/csvn/index.html +++ b/plugins/csvn/index.html @@ -26,9 +26,11 @@ $.getScript( "/plugins/file?name=csvn&f=js/csvn.js"); function csvnReadme(){ var html = '

* 注意:在启动时会比较慢,需要耐心等待一会

'; html += '

* 注意:csvn需要java环境,在安装会自动检查并安装

'; + html += '

* 注意:默认后台密码admin:admin,最好马上修改

'; html += '

* 注意:牢记admin的密码,在后csvn的管理后台和这里不同步

'; html += '

* 注意:在这里添加用户和csvn后台并不同步

'; html += '

* 注意:项目管理的地址一般是正确的,但在特殊环境下,地址可能不一致

'; + $('.bt-w-main .soft-man-con').html(html); } diff --git a/plugins/csvn/index.py b/plugins/csvn/index.py index 00439f67a..9f69e3105 100755 --- a/plugins/csvn/index.py +++ b/plugins/csvn/index.py @@ -275,13 +275,9 @@ def getCsvnPort(): return '3343' -def projectList(): - import math - args = getArgs() - +def getALlProjectList(): path = getServerDir() + '/data/repositories' dlist = [] - data = {} if os.path.exists(path): for filename in os.listdir(path): tmp = {} @@ -289,6 +285,12 @@ def projectList(): if os.path.isdir(filePath): tmp['name'] = filename dlist.append(tmp) + return dlist + + +def projectList(): + import math + args = getArgs() page = 1 page_size = 10 @@ -298,6 +300,9 @@ def projectList(): if 'page_size' in args: page_size = int(args['page_size']) + dlist = getALlProjectList() + data = {} + dlist_sum = len(dlist) page_info = {'count': dlist_sum, 'p': page, 'row': 10, 'tojs': 'csvnProjectList'}