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

conflict fixed

Browse Source
This commit is contained in:
shanshuirenjia
2020-04-01 11:19:09 +08:00
parent 6181619f0e 54621adb8a
commit e9f3f8ed2e
25 changed files with 369 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/toolbar/common-toolbar.js
View File

@@ -1,9 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import { isPro, gettext } from '../../utils/constants';
import { isPro, gettext, showLogoutIcon } from '../../utils/constants';
import Search from '../search/search';
import Notification from '../common/notification';
import Account from '../common/account';
import Logout from '../common/logout';
const propTypes = {
repoID: PropTypes.string,
@@ -25,6 +26,7 @@ class CommonToolbar extends React.Component {
)}
<Notification />
<Account />
{showLogoutIcon && (<Logout />)}
</div>
);
}