1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-27 19:05:16 +00:00

change dialog style

This commit is contained in:
Michael An 2025-02-26 10:10:19 +08:00
parent 67dd7e5eed
commit 47f016e6e9
5 changed files with 14 additions and 23 deletions

View File

@ -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 {
<ModalBody>
{link ?
<>
<div>
<strong>{gettext('Group invitation link')}</strong>
</div>
<Label>{gettext('Group invitation link')}</Label>
<div className="invite-link-item">
<div className="form-item text-truncate">{link.link}</div>
<div className="invite-link-copy">

View File

@ -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;
}

View File

@ -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 &&
<GroupInviteMembersDialog
groupID={this.props.groupID}
onGroupChanged={this.props.onGroupChanged}
toggleGroupInviteDialog={this.toggleInviteMembersDialog}/>
toggleInviteMembersDialog={this.toggleInviteMembersDialog}
/>
}
</Fragment>
);

View File

@ -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);
}

View File

@ -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,