diff --git a/frontend/src/components/dialog/group-invite-members-dialog.js b/frontend/src/components/dialog/group-invite-members-dialog.js index b69440cd4b..26bf45b8a4 100644 --- a/frontend/src/components/dialog/group-invite-members-dialog.js +++ b/frontend/src/components/dialog/group-invite-members-dialog.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Button, Modal, ModalBody } from 'reactstrap'; +import { Button, Modal, ModalBody, Label } from 'reactstrap'; import SeahubModalHeader from '@/components/common/seahub-modal-header'; import copy from 'copy-to-clipboard'; import toaster from '../toast'; @@ -12,7 +12,7 @@ import '../../css/group-invite-members-dialog.css'; const propTypes = { groupID: PropTypes.string.isRequired, - toggleGroupInviteDialog: PropTypes.func.isRequired, + toggleInviteMembersDialog: PropTypes.func.isRequired, }; class GroupInviteMembersDialog extends React.Component { @@ -69,7 +69,7 @@ class GroupInviteMembersDialog extends React.Component { }; toggle = () => { - this.props.toggleGroupInviteDialog(); + this.props.toggleInviteMembersDialog(); }; render() { @@ -81,9 +81,7 @@ class GroupInviteMembersDialog extends React.Component { {link ? <> -
- {gettext('Group invitation link')} -
+
{link.link}
diff --git a/frontend/src/css/group-invite-members-dialog.css b/frontend/src/css/group-invite-members-dialog.css index bc6dfc395b..cfee611edc 100644 --- a/frontend/src/css/group-invite-members-dialog.css +++ b/frontend/src/css/group-invite-members-dialog.css @@ -1,17 +1,12 @@ -.group-invite-members th, -.group-invite-members td { - vertical-align: middle; - text-align: left; -} - .group-invite-members .no-link-tip { line-height: 24px; - color: #999; + color: #666; + font-size: 14px; } .invite-link-item { display: flex; - margin: 1rem 0 2.5rem; + margin-bottom: 2.5rem; } .invite-link-item .form-item { @@ -36,5 +31,4 @@ .invite-link-item .delete-link-btn { color: #999; - width: 40px; } diff --git a/frontend/src/pages/groups/group-view.js b/frontend/src/pages/groups/group-view.js index 8c2446a470..92e386d36f 100644 --- a/frontend/src/pages/groups/group-view.js +++ b/frontend/src/pages/groups/group-view.js @@ -374,7 +374,6 @@ class GroupView extends React.Component { getOpList = () => { const { currentGroup, isDepartmentGroup, isStaff, isOwner } = this.state; - // const isGroup = this.state.currentGroup.owner !== 'system admin'; const opList = []; if ((!isDepartmentGroup && canAddRepo) || (isDepartmentGroup && isStaff)) { @@ -401,7 +400,7 @@ class GroupView extends React.Component { } if (isOwner && this.state.currentGroup.owner !== 'system admin' && !isMultiTenancy) { - opList.push({ 'text': gettext('Invite Members'), 'onClick': this.toggleInviteMembersDialog }); + opList.push({ 'text': gettext('Invite members'), 'onClick': this.toggleInviteMembersDialog }); } } @@ -606,8 +605,8 @@ class GroupView extends React.Component { {this.state.showInviteMembersDialog && + toggleInviteMembersDialog={this.toggleInviteMembersDialog} + /> } ); diff --git a/frontend/src/utils/seafile-api.js b/frontend/src/utils/seafile-api.js index 91b3b3a076..5fa5fe2532 100644 --- a/frontend/src/utils/seafile-api.js +++ b/frontend/src/utils/seafile-api.js @@ -304,18 +304,18 @@ class SeafileAPI { } deleteGroupInviteLinks(groupID, token) { - const url = this.server + '/api/v2.1/groups/' + groupID + '/invite-links/' + token + '/'; + const url = `${this.server}/api/v2.1/groups/${groupID}/invite-links/${token}/`; return this.req.delete(url); } addGroupInviteLinks(groupID) { - const url = this.server + '/api/v2.1/groups/' + groupID + '/invite-links/'; + const url = `${this.server}/api/v2.1/groups/${groupID}/invite-links/`; let formData = new FormData(); return this._sendPostRequest(url, formData); } getGroupInviteLinks(groupID) { - const url = this.server + '/api/v2.1/groups/' + groupID + '/invite-links/'; + const url = `${this.server}/api/v2.1/groups/${groupID}/invite-links/`; return this.req.get(url); } diff --git a/sql/mysql.sql b/sql/mysql.sql index ad2594b3be..cdb0371507 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1587,7 +1587,7 @@ CREATE TABLE `RepoTransfer` ( PRIMARY KEY (`id`), KEY `idx_file_transfer_org_id` (`org_id`), KEY `idx_file_transfer_timestamp` (`timestamp`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; CREATE TABLE `group_invite_link` ( `id` int(11) NOT NULL AUTO_INCREMENT,