haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-06 09:34:00 +00:00
Code Issues Releases Wiki Activity

Revert "update LOGOUT_URL; (#4785)"

Browse Source 
This reverts commit d75beba8bd.
This commit is contained in:
lian 2021-07-08 16:47:09 +08:00
parent 0c76c0c441
commit 5472974cc8
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/common/account.js
View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import { seafileAPI } from '../../utils/seafile-api'; 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'; import toaster from '../toast';
const propTypes = { const propTypes = {
@ -164,7 +164,7 @@ class Account extends Component {
</div> </div>
<a href={siteRoot + 'profile/'} className="item">{gettext('Settings')}</a> <a href={siteRoot + 'profile/'} className="item">{gettext('Settings')}</a>
{this.renderMenu()} {this.renderMenu()}
<a href={logoutUrl} className="item">{gettext('Log out')}</a> <a href={siteRoot + 'accounts/logout/'} className="item">{gettext('Log out')}</a>
</div> </div>
</div> </div>
</div> </div>

6
frontend/src/components/common/logout.js
View File

@ -1,10 +1,10 @@
import React from 'react'; import React from 'react';
import { gettext, logoutUrl } from '../../utils/constants'; import { siteRoot, gettext } from '../../utils/constants';
export default function Logout() { export default function Logout() {
return ( return (
<a className="logout-icon" href={logoutUrl} title={gettext('Log out')}> <a className="logout-icon" href={`${siteRoot}accounts/logout/`} title={gettext('Log out')}>
<i className="sf3-font sf3-font-logout" style={{fontSize: '24px'}}></i> <i className="sf3-font sf3-font-logout" style={{fontSize: '24px'}}></i>
</a> </a>
); );
} }

1
frontend/src/utils/constants.js
View File

@ -3,7 +3,6 @@ export const gettext = window.gettext;
export const siteRoot = window.app.config.siteRoot; export const siteRoot = window.app.config.siteRoot;
export const loginUrl = window.app.config.loginUrl; export const loginUrl = window.app.config.loginUrl;
export const logoutUrl = window.app.config.logoutUrl;
export const avatarInfo = window.app.config.avatarInfo; export const avatarInfo = window.app.config.avatarInfo;
export const logoPath = window.app.config.logoPath; export const logoPath = window.app.config.logoPath;
export const mediaUrl = window.app.config.mediaUrl; export const mediaUrl = window.app.config.mediaUrl;

1
seahub/base/context_processors.py
View File

@ -133,7 +133,6 @@ def base(request):
'constance_enabled': dj_settings.CONSTANCE_ENABLED, 'constance_enabled': dj_settings.CONSTANCE_ENABLED,
'FILE_SERVER_ROOT': file_server_root, 'FILE_SERVER_ROOT': file_server_root,
'LOGIN_URL': dj_settings.LOGIN_URL, 'LOGIN_URL': dj_settings.LOGIN_URL,
'LOGOUT_URL': dj_settings.LOGOUT_URL,
'enable_thumbnail': ENABLE_THUMBNAIL, 'enable_thumbnail': ENABLE_THUMBNAIL,
'thumbnail_size_for_original': THUMBNAIL_SIZE_FOR_ORIGINAL, 'thumbnail_size_for_original': THUMBNAIL_SIZE_FOR_ORIGINAL,
'enable_guest_invitation': ENABLE_GUEST_INVITATION, 'enable_guest_invitation': ENABLE_GUEST_INVITATION,

1
seahub/templates/base_for_react.html
View File

@ -40,7 +40,6 @@
siteName: '{{ site_name|escapejs }}', siteName: '{{ site_name|escapejs }}',
siteRoot: '{{ SITE_ROOT }}', siteRoot: '{{ SITE_ROOT }}',
loginUrl: '{{ LOGIN_URL }}', loginUrl: '{{ LOGIN_URL }}',
logoutUrl: '{{ LOGOUT_URL }}',
isPro: '{{ is_pro }}', isPro: '{{ is_pro }}',
isDocs: '{{ is_docs }}', isDocs: '{{ is_docs }}',
lang: '{{ LANGUAGE_CODE }}', lang: '{{ LANGUAGE_CODE }}',