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

Fix bugs (#3070)

Browse Source 
* fix-loading

* fix-group-dialog
This commit is contained in:
Michael An
2019-03-07 12:23:44 +08:00
committed by Daniel Pan
parent c986982f5c
commit 425f629488
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dialog/create-group-dialog.js
View File

@@ -53,7 +53,7 @@ class CreateGroupDialog extends React.Component {
render() { render() {
return( return(
<Modal isOpen={this.props.showAddGroupModal} toggle={this.props.toggleAddGroupModal}> <Modal isOpen={this.props.showAddGroupModal} toggle={this.props.toggleAddGroupModal}>
<ModalHeader toggle={this.toggle}>{gettext('New Group')}</ModalHeader> <ModalHeader toggle={this.props.toggleAddGroupModal}>{gettext('New Group')}</ModalHeader>
<ModalBody> <ModalBody>
<label htmlFor="groupName">{gettext('Name')}</label> <label htmlFor="groupName">{gettext('Name')}</label>
<Input type="text" id="groupName" value={this.state.groupName} <Input type="text" id="groupName" value={this.state.groupName}

2
frontend/src/components/dialog/share-dialog.js
View File

@@ -158,7 +158,7 @@ class ShareDialog extends React.Component {
const enableShareLink = !repoEncrypted && canGenerateShareLink; const enableShareLink = !repoEncrypted && canGenerateShareLink;
return ( return (
<div> <div>
<Modal isOpen={true} style={{maxWidth: '720px'}} className="share-dialog"> <Modal isOpen={true} style={{maxWidth: '720px'}} className="share-dialog" toggle={this.props.toggleDialog}>
<ModalHeader toggle={this.props.toggleDialog}>{gettext('Share')} <span className="op-target" title={itemName}>{itemName}</span></ModalHeader> <ModalHeader toggle={this.props.toggleDialog}>{gettext('Share')} <span className="op-target" title={itemName}>{itemName}</span></ModalHeader>
<ModalBody className="dialog-list-container share-dialog-content"> <ModalBody className="dialog-list-container share-dialog-content">
{(itemType === 'library' || itemType === 'dir') && this.renderDirContent()} {(itemType === 'library' || itemType === 'dir') && this.renderDirContent()}

4
frontend/src/components/select-editor/select-editor.js
View File

@@ -81,9 +81,9 @@ class SelectEditor extends React.Component {
options={this.options} options={this.options}
className="permission-editor-select" className="permission-editor-select"
classNamePrefix="permission-editor" classNamePrefix="permission-editor"
placeholder={gettext('Select...')} placeholder={this.props.translateOption(currentOption)}
onChange={this.onOptionChanged} onChange={this.onOptionChanged}
menuPlacement="auto" captureMenuScroll={false}
/> />
} }
{(isTextMode && !this.state.isEditing) && {(isTextMode && !this.state.isEditing) &&

6
frontend/src/draft.js
View File

@@ -145,7 +145,8 @@ class Draft extends React.Component {
const url = 'history-' + preCommitID + '-' + currentCommitID; const url = 'history-' + preCommitID + '-' + currentCommitID;
this.setURL(url); this.setURL(url);
this.setState({ this.setState({
activeItem: activeItem activeItem: activeItem,
isLoading: true,
}); });
axios.all([ axios.all([
seafileAPI.getFileRevision(draftRepoID, currentCommitID, currentItem.path), seafileAPI.getFileRevision(draftRepoID, currentCommitID, currentItem.path),
@@ -417,7 +418,8 @@ class Draft extends React.Component {
setDiffViewerContent = (newContent, prevContent) => { setDiffViewerContent = (newContent, prevContent) => {
this.setState({ this.setState({
draftContent: newContent, draftContent: newContent,
draftOriginContent: prevContent draftOriginContent: prevContent,
isLoading: false,
}); });
} }