修正覆盖提示的样式

aaPanel · Jul 3, 2019 · af1cbc5 · af1cbc5
1 parent fb7a77a
commit af1cbc5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/BTPanel/static/js/files.js b/BTPanel/static/js/files.js
@@ -801,7 +801,7 @@ function BatchPaste(){
 			for(var i=0;i<result.length;i++){
 				tbody += '<tr><td>'+result[i].filename+'</td><td>'+ToSize(result[i].size)+'</td><td>'+getLocalTime(result[i].mtime)+'</td></tr>';
 			}
-			var mbody = '<div class="divtable"><table class="table table-hover" width="100%" border="0" cellpadding="0" cellspacing="0"><thead><th>文件名</th><th>大小</th><th>最后修改时间</th></thead>\
+            var mbody = '<div class="divtable" style="height: 395px;overflow: auto;border: #ddd 1px solid;position: relative;"><table class="table table-hover" width="100%" border="0" cellpadding="0" cellspacing="0"><thead><th>文件名</th><th>大小</th><th>最后修改时间</th></thead>\
 						<tbody>'+tbody+'</tbody>\
 						</table></div>';
 			SafeMessage('即将覆盖以下文件',mbody,function(){

diff --git a/class/panelSite.py b/class/panelSite.py
@@ -2282,15 +2282,15 @@ def DelUserInI(self,path,up = 0):
             os.remove(useriniPath)
 
         for p1 in os.listdir(path):
-            npath = path + '/' + p1;
-            if not os.path.isdir(npath): continue
-            useriniPath = npath + '/.user.ini';
-            if os.path.exists(useriniPath): 
-                public.ExecShell('chattr -i ' + useriniPath);
-                os.remove(useriniPath)
-
-            if up < 3: self.DelUserInI(npath, up + 1);
-
+            try:
+                npath = path + '/' + p1;
+                if not os.path.isdir(npath): continue
+                useriniPath = npath + '/.user.ini';
+                if os.path.exists(useriniPath): 
+                    public.ExecShell('chattr -i ' + useriniPath);
+                    os.remove(useriniPath)
+                if up < 3: self.DelUserInI(npath, up + 1);
+            except: continue
         return True;