diff --git a/frontend/src/components/common/account.js b/frontend/src/components/common/account.js index 4df5a81088..9c660233df 100644 --- a/frontend/src/components/common/account.js +++ b/frontend/src/components/common/account.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import { Utils } from '../../utils/utils'; import { seafileAPI } from '../../utils/seafile-api'; -import { siteRoot, gettext, appAvatarURL, logoutUrl } from '../../utils/constants'; +import { siteRoot, gettext, appAvatarURL } from '../../utils/constants'; import toaster from '../toast'; const propTypes = { @@ -164,7 +164,7 @@ class Account extends Component { {gettext('Settings')} {this.renderMenu()} - {gettext('Log out')} + {gettext('Log out')} diff --git a/frontend/src/components/common/logout.js b/frontend/src/components/common/logout.js index bcceb9b63f..863243f6fc 100644 --- a/frontend/src/components/common/logout.js +++ b/frontend/src/components/common/logout.js @@ -1,10 +1,10 @@ import React from 'react'; -import { gettext, logoutUrl } from '../../utils/constants'; +import { siteRoot, gettext } from '../../utils/constants'; export default function Logout() { return ( - + ); -} +} \ No newline at end of file diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index dc260a936e..43a3c3b855 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -3,7 +3,6 @@ export const gettext = window.gettext; export const siteRoot = window.app.config.siteRoot; export const loginUrl = window.app.config.loginUrl; -export const logoutUrl = window.app.config.logoutUrl; export const avatarInfo = window.app.config.avatarInfo; export const logoPath = window.app.config.logoPath; export const mediaUrl = window.app.config.mediaUrl; diff --git a/seahub/base/context_processors.py b/seahub/base/context_processors.py index 6b7ca9b252..c79d589bb5 100644 --- a/seahub/base/context_processors.py +++ b/seahub/base/context_processors.py @@ -133,7 +133,6 @@ def base(request): 'constance_enabled': dj_settings.CONSTANCE_ENABLED, 'FILE_SERVER_ROOT': file_server_root, 'LOGIN_URL': dj_settings.LOGIN_URL, - 'LOGOUT_URL': dj_settings.LOGOUT_URL, 'enable_thumbnail': ENABLE_THUMBNAIL, 'thumbnail_size_for_original': THUMBNAIL_SIZE_FOR_ORIGINAL, 'enable_guest_invitation': ENABLE_GUEST_INVITATION, diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html index 80490f7985..7f6587364f 100644 --- a/seahub/templates/base_for_react.html +++ b/seahub/templates/base_for_react.html @@ -40,7 +40,6 @@ siteName: '{{ site_name|escapejs }}', siteRoot: '{{ SITE_ROOT }}', loginUrl: '{{ LOGIN_URL }}', - logoutUrl: '{{ LOGOUT_URL }}', isPro: '{{ is_pro }}', isDocs: '{{ is_docs }}', lang: '{{ LANGUAGE_CODE }}',