diff --git a/frontend/src/components/dirent-grid-view/dirent-grid-view.js b/frontend/src/components/dirent-grid-view/dirent-grid-view.js index c6841d59a1..a34b28fc29 100644 --- a/frontend/src/components/dirent-grid-view/dirent-grid-view.js +++ b/frontend/src/components/dirent-grid-view/dirent-grid-view.js @@ -153,7 +153,7 @@ class DirentGridView extends React.Component{ this.onCreateFileToggle(currentObject); break; case 'Access Log': - this.onAccessLog(); + this.onAccessLog(currentObject); break; case 'Open via Client': this.onOpenViaClient(currentObject); @@ -245,8 +245,10 @@ class DirentGridView extends React.Component{ location.href = url; } - onAccessLog = () => { - + onAccessLog = (currentObject) => { + let filePath = this.getDirentPath(currentObject); + let path = siteRoot + 'repo/file-access/' + this.props.repoID + '/?p=' + encodeURIComponent(filePath) ; + window.open(path); } onOpenViaClient = (currentObject) => { @@ -449,7 +451,7 @@ class DirentGridView extends React.Component{ menuList.push(COMMENT); } menuList.push(HISTORY); - if (fileAuditEnabled) { + if (isPro && fileAuditEnabled) { menuList.push(ACCESS_LOG); } menuList.push('Divider'); diff --git a/frontend/src/components/dirent-list-view/dirent-list-view.js b/frontend/src/components/dirent-list-view/dirent-list-view.js index 0e27b7be56..cd1cedc666 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-view.js +++ b/frontend/src/components/dirent-list-view/dirent-list-view.js @@ -506,7 +506,7 @@ class DirentListView extends React.Component { menuList.push(COMMENT); } menuList.push(HISTORY); - if (fileAuditEnabled) { + if (isPro && fileAuditEnabled) { menuList.push(ACCESS_LOG); } menuList.push('Divider'); diff --git a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js index 1b62de379b..adbabd7d7d 100644 --- a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js +++ b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js @@ -109,7 +109,7 @@ class MutipleDirOperationToolbar extends React.Component { return menu !== RELATED_FILES; }); } - if (!fileAuditEnabled) { + if (!isPro || !fileAuditEnabled) { menuList = menuList.filter(menu => { return menu !== ACCESS_LOG; }); diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 8c8d693725..f47dc922a8 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -26,7 +26,7 @@ export const canAddRepo = window.app.pageOptions.canAddRepo; export const canGenerateShareLink = window.app.pageOptions.canGenerateShareLink; export const canGenerateUploadLink = window.app.pageOptions.canGenerateUploadLink ? true : false; export const canViewOrg = window.app.pageOptions.canViewOrg === 'True'; -export const fileAuditEnabled = window.app.pageOptions.fileAuditEnabled ? true : false; +export const fileAuditEnabled = window.app.pageOptions.fileAuditEnabled; export const enableFileComment = window.app.pageOptions.enableFileComment ? true : false; export const folderPermEnabled = window.app.pageOptions.folderPermEnabled; export const enableResetEncryptedRepoPassword = window.app.pageOptions.enableResetEncryptedRepoPassword === 'True'; diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html index bafd1c1e96..c51ad68608 100644 --- a/seahub/templates/base_for_react.html +++ b/seahub/templates/base_for_react.html @@ -53,7 +53,7 @@ canGenerateShareLink: {% if user.permissions.can_generate_share_link %} true {% else %} false {% endif %}, canGenerateUploadLink: {% if user.permissions.can_generate_upload_link %} true {% else %} false {% endif %}, canViewOrg:'{{ user.permissions.can_view_org }}', - fileAuditEnabled: '{{ file_audit_enabled }}', + fileAuditEnabled: {% if file_audit_enabled %} true {% else %} false {% endif %}, enableFileComment: {% if enableFileComment %} true {% else %} false {% endif %}, folderPermEnabled: {% if folder_perm_enabled %} true {% else %} false {% endif %}, enableResetEncryptedRepoPassword: '{{ enable_reset_encrypted_repo_password }}',