From fb4311cdbf902fa6a03fe56c589826e69ac2eae3 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 12 Dec 2018 00:07:01 +0800
Subject: [PATCH] update

---
 plugins/csvn/index.py   |  4 +++-
 plugins/csvn/js/csvn.js | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/plugins/csvn/index.py b/plugins/csvn/index.py
index c274a297f..7578f55cc 100755
--- a/plugins/csvn/index.py
+++ b/plugins/csvn/index.py
@@ -314,7 +314,6 @@ def makeAclFile(content):
     svn_access_file = getServerDir() + '/data/conf/svn_access_file'
     tmp = "\n"
     for k, v in content.items():
-        print k, v
         if k == '':
             tmp += "[/]\n"
         else:
@@ -329,6 +328,9 @@ def makeAclFile(content):
 
 def projectAclList():
     acl = getAllAclList()
+    args = getArgs()
+    if 'page' in acl:
+        page = int(args['page'])
     makeAclFile(acl)
     return public.getJson(acl)
 
diff --git a/plugins/csvn/js/csvn.js b/plugins/csvn/js/csvn.js
index d861b0209..40aef00f8 100755
--- a/plugins/csvn/js/csvn.js
+++ b/plugins/csvn/js/csvn.js
@@ -186,7 +186,8 @@ function csvnProjectList(page){
         for (i in ulist){
             content += '<tr><td>'+ulist[i]['name']+'</td>'+
                 '<td>'+ulist[i]['ver']+'</td><td>'+
-                '<a class="btlink" onclick="csvnDelProject(\''+ulist[i]['name']+'\')">删除</a>' +
+                '<a class="btlink" onclick="csvnDelProject(\''+ulist[i]['name']+'\')">删除</a> | ' +
+                '<a class="btlink" onclick="csvnAclProject(\''+ulist[i]['name']+'\')">权限</a>' +
                 '</td></tr>';
         }
 
@@ -286,5 +287,27 @@ function csvnAddProject(){
             layer.msg("操作成功!",{icon:1,time:3000,shade: [0.3, '#000']});
         },'json');
     });
+}
 
+function csvnAclProject(name){
+    console.log(name);
+    // 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>';
+    var loadOpen = layer.open({
+        type: 1,
+        title: '权限设置',
+        area: '400px',
+        content:"<div class='bt-form pd20 pb70 c6'>\
+            <div class='version line'>\
+                <div>\
+                    <input class='bt-input-text mr5 outline_no' type='text' id='csvn_name' name='username' style='height: 28px; border-radius: 3px;width: 200px;' placeholder='用户名'>\
+                    <button class='btn btn-success btn-sm'>添加</button>\
+                </div>\
+            </div>\
+            <div class='bt-form-submit-btn'>\
+                <button type='button' id='csvn_acl_close' class='btn btn-danger btn-sm btn-title'>关闭</button>\
+                <button type='button' id='csvn_acl_ok' class='btn btn-success btn-sm btn-title bi-btn'>确认</button>\
+            </div>\
+        </div>"
+    });
 }
\ No newline at end of file