修正权限格式

plugins/csvn/index.py

@@ -356,7 +356,7 @@ def getAllAclList():
     allAcl = {}
     for i in range(len(aData)):
         oData = aData[i].strip().split(']')
-        name = oData[0].strip('/')
+        name = oData[0].strip('/').strip(':')
         if oData[1] == '':
             allAcl[name] = []
         else:
@@ -380,7 +380,7 @@ def makeAclFile(content):
         if k == '':
             tmp += "[/]\n"
         else:
-            tmp += "[/" + k + "]\n"
+            tmp += "[" + k + ":/]\n"
 
         for iv in range(len(v)):
             tmp += v[iv]['user'] + ' = ' + v[iv]['acl'] + "\n"

plugins/csvn/js/csvn.js

@@ -358,7 +358,6 @@ function csvnProjectScriptLoad(pname){
 
 function csvnProjectScriptUnload(pname){
     csvnPost('project_script_unload', {'pname':pname}, function(data){
-        console.log(data);
         if (data.data != 'ok'){
             layer.msg(data.data,{icon:0,time:2000,shade: [0.3, '#000']});
             return;
@@ -411,7 +410,7 @@ function csvnAclAdd(pname){
             layer.msg(data.data,{icon:0,time:2000,shade: [0.3, '#000']});
             return;
         }
-        $('#csvn_acl_close').click();
+        $('.layui-layer-close1').click();
         csvnAclProject(pname);
     });
 }
@@ -422,7 +421,7 @@ function csvnAclDel(pname, uname){
             layer.msg(data.data,{icon:0,time:2000,shade: [0.3, '#000']});
             return;
         }
-        $('#csvn_acl_close').click();
+        $('.layui-layer-close1').click();
         csvnAclProject(pname);
     });
 }
@@ -441,7 +440,7 @@ function csvnAclSet(obj, pname, uname, acl, selected){
             return;
         }
 
-        $('#csvn_acl_close').click();
+        $('.layui-layer-close1').click();
         csvnAclProject(pname);
     });
 }
@@ -470,7 +469,7 @@ function csvnAclProject(pname){
 
         var loadOpen = layer.open({
             type: 1,
-            title: '权限设置',
+            title: '项目('+pname+')权限设置',
             area: '300px',
             content:"<div class='bt-form pd20 c6'>\
                     <div>\
@@ -482,9 +481,5 @@ function csvnAclProject(pname){
                     </div>\
                 </div>"
         });
-
-        $('#csvn_acl_close').click(function(){
-            layer.close(loadOpen);
-        });
     });
 }