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

Merge pull request #5171 from haiwen/file-history-view-snapshot

Browse Source 
File history view snapshot
This commit is contained in:
Daniel Pan
2022-04-13 13:45:45 +08:00
committed by GitHub
parent 339c909577 1e4a3933de
commit 65c38e71a3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/pages/file-history-old/history-item.js
View File

@@ -48,6 +48,7 @@ class HistoryItem extends React.Component {
let userProfileURL = `${siteRoot}profile/${encodeURIComponent(item.creator_email)}/`; let userProfileURL = `${siteRoot}profile/${encodeURIComponent(item.creator_email)}/`;
let viewUrl = `${siteRoot}repo/${historyRepoID}/history/files/?obj_id=${item.rev_file_id}&commit_id=${item.commit_id}&p=${Utils.encodePath(filePath)}`; let viewUrl = `${siteRoot}repo/${historyRepoID}/history/files/?obj_id=${item.rev_file_id}&commit_id=${item.commit_id}&p=${Utils.encodePath(filePath)}`;
let diffUrl = `${siteRoot}repo/text_diff/${historyRepoID}/?commit=${item.commit_id}&p=${Utils.encodePath(filePath)}`; let diffUrl = `${siteRoot}repo/text_diff/${historyRepoID}/?commit=${item.commit_id}&p=${Utils.encodePath(filePath)}`;
const snapshotURL = `${siteRoot}repo/${historyRepoID}/snapshot/?commit_id=${item.commit_id}`;
return ( return (
<Fragment> <Fragment>
<tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} className={this.state.active ? 'tr-highlight' : ''}> <tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} className={this.state.active ? 'tr-highlight' : ''}>
@@ -67,6 +68,7 @@ class HistoryItem extends React.Component {
downloadUrl={downloadUrl} downloadUrl={downloadUrl}
viewUrl={viewUrl} viewUrl={viewUrl}
diffUrl={diffUrl} diffUrl={diffUrl}
snapshotURL={snapshotURL}
onItemRestore={this.onItemRestore} onItemRestore={this.onItemRestore}
canDownload={this.props.canDownload} canDownload={this.props.canDownload}
canCompare={this.props.canCompare} canCompare={this.props.canCompare}
@@ -106,7 +108,7 @@ class MoreMenu extends React.PureComponent {
} }
render() { render() {
const { index, downloadUrl, viewUrl, diffUrl, onItemRestore, canCompare, canDownload } = this.props; const { index, downloadUrl, viewUrl, diffUrl, snapshotURL, onItemRestore, canCompare, canDownload } = this.props;
return ( return (
<Dropdown isOpen={this.state.dropdownOpen} toggle={this.dropdownToggle} direction="down" className="mx-1 old-history-more-operation"> <Dropdown isOpen={this.state.dropdownOpen} toggle={this.dropdownToggle} direction="down" className="mx-1 old-history-more-operation">
<DropdownToggle <DropdownToggle
@@ -122,6 +124,7 @@ class MoreMenu extends React.PureComponent {
{canDownload && <a href={downloadUrl}><DropdownItem>{gettext('Download')}</DropdownItem></a>} {canDownload && <a href={downloadUrl}><DropdownItem>{gettext('Download')}</DropdownItem></a>}
<a href={viewUrl}><DropdownItem>{gettext('View')}</DropdownItem></a> <a href={viewUrl}><DropdownItem>{gettext('View')}</DropdownItem></a>
{/*canCompare && <a href={diffUrl}><DropdownItem>{gettext('Diff')}</DropdownItem></a>*/} {/*canCompare && <a href={diffUrl}><DropdownItem>{gettext('Diff')}</DropdownItem></a>*/}
{index != 0 && <DropdownItem tag="a" href={snapshotURL} target="_blank">{gettext('View Related Snapshot')}</DropdownItem>}
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
); );