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

change detail panel (#3856)

Browse Source
This commit is contained in:
Michael An
2019-07-16 16:21:20 +08:00
committed by Daniel Pan
parent 0fc368648a
commit 99785665fc
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dirent-detail/dirent-details.js
View File

@@ -225,7 +225,7 @@ class DirentDetail extends React.Component {
<TabPane tabId="comments" className="comments h-100"> <TabPane tabId="comments" className="comments h-100">
<DetailCommentList <DetailCommentList
repoID={this.props.repoID} repoID={this.props.repoID}
filePath={(dirent && dirent.type === 'file') ? path + dirent.name : path} filePath={(dirent && dirent.type === 'file') ? path + '/' + dirent.name : path}
/> />
</TabPane> </TabPane>
</TabContent> </TabContent>

20
frontend/src/pages/lib-content-view/lib-content-container.js
View File

@@ -133,11 +133,19 @@ class LibContentContainer extends React.Component {
} }
onItemDelete = (dirent) => { onItemDelete = (dirent) => {
let currentDirent = this.state; this.checkCurrentDirent(dirent);
if (currentDirent && dirent.name === currentDirent.name) { this.props.onItemDelete(dirent);
}
onItemMove = (destRepo, dirent, selectedPath, currentPath) => {
this.checkCurrentDirent(dirent);
this.props.onItemMove(destRepo, dirent, selectedPath, currentPath);
}
checkCurrentDirent = (deletedDirent) => {
if (deletedDirent.name === this.state.currentDirent.name) {
this.setState({currentDirent: null}); this.setState({currentDirent: null});
} }
this.props.onItemDelete(dirent);
} }
onItemsScroll = (e) => { onItemsScroll = (e) => {
@@ -212,7 +220,7 @@ class LibContentContainer extends React.Component {
onItemSelected={this.onItemSelected} onItemSelected={this.onItemSelected}
onItemDelete={this.onItemDelete} onItemDelete={this.onItemDelete}
onItemRename={this.props.onItemRename} onItemRename={this.props.onItemRename}
onItemMove={this.props.onItemMove} onItemMove={this.onItemMove}
onItemCopy={this.props.onItemCopy} onItemCopy={this.props.onItemCopy}
onDirentClick={this.onDirentClick} onDirentClick={this.onDirentClick}
updateDirent={this.props.updateDirent} updateDirent={this.props.updateDirent}
@@ -246,7 +254,7 @@ class LibContentContainer extends React.Component {
onAddFile={this.props.onAddFile} onAddFile={this.props.onAddFile}
onItemClick={this.onItemClick} onItemClick={this.onItemClick}
onItemDelete={this.props.onItemDelete} onItemDelete={this.props.onItemDelete}
onItemMove={this.props.onItemMove} onItemMove={this.onItemMove}
onItemCopy={this.props.onItemCopy} onItemCopy={this.props.onItemCopy}
updateDirent={this.props.updateDirent} updateDirent={this.props.updateDirent}
onAddFolder={this.props.onAddFolder} onAddFolder={this.props.onAddFolder}
@@ -304,7 +312,7 @@ class LibContentContainer extends React.Component {
onItemSelected={this.onItemSelected} onItemSelected={this.onItemSelected}
onItemDelete={this.onItemDelete} onItemDelete={this.onItemDelete}
onItemRename={this.props.onItemRename} onItemRename={this.props.onItemRename}
onItemMove={this.props.onItemMove} onItemMove={this.onItemMove}
onItemCopy={this.props.onItemCopy} onItemCopy={this.props.onItemCopy}
onDirentClick={this.onDirentClick} onDirentClick={this.onDirentClick}
updateDirent={this.props.updateDirent} updateDirent={this.props.updateDirent}