mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-05 08:53:14 +00:00
[rebase master] bugfix after rebasing master(handling conflicts)
This commit is contained in:
@@ -623,9 +623,9 @@ export const Utils = {
|
||||
},
|
||||
|
||||
getFileExtension: function (fileName, withoutDot) {
|
||||
let parts = fileName.toLowerCase().split(".");
|
||||
let parts = fileName.toLowerCase().split('.');
|
||||
|
||||
return withoutDot ? parts.pop() : "." + parts.pop();
|
||||
return withoutDot ? parts.pop() : '.' + parts.pop();
|
||||
},
|
||||
|
||||
getDirentOperationList: function(isRepoOwner, currentRepoInfo, dirent, isContextmenu) {
|
||||
@@ -1468,7 +1468,7 @@ export const Utils = {
|
||||
return level;
|
||||
},
|
||||
|
||||
getSharedPermission(item) {
|
||||
getSharedPermission: function(item) {
|
||||
let permission = item.permission;
|
||||
if (item.is_admin) {
|
||||
permission = 'admin';
|
||||
@@ -1479,7 +1479,7 @@ export const Utils = {
|
||||
return permission;
|
||||
},
|
||||
|
||||
getUserPermission(userPerm) {
|
||||
getUserPermission: function(userPerm) {
|
||||
const { custom_permission } = window;
|
||||
const common_permissions = ['rw', 'r', 'admin', 'cloud-edit', 'preview'];
|
||||
// visit the shared repo(virtual repo) by custom permission
|
||||
@@ -1496,7 +1496,7 @@ export const Utils = {
|
||||
// TODO user set custom permission on folder
|
||||
}
|
||||
return { isCustomPermission: false };
|
||||
}
|
||||
},
|
||||
|
||||
// for a11y
|
||||
onKeyDown: function(e) {
|
||||
|
Reference in New Issue
Block a user