1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 15:53:28 +00:00

[repo/folder trash] update

This commit is contained in:
llj
2019-06-06 12:13:03 +08:00
parent 217278710b
commit dd965abbb0

View File

@@ -78,6 +78,9 @@ class RepoFolderTrash extends React.Component {
}
getMore = () => {
this.setState({
isLoading: true
});
this.getItems(this.state.scanStat);
}
@@ -325,7 +328,8 @@ class Item extends React.Component {
request.then((res) => {
this.setState({
restored: true
}); toaster.success(gettext('Successfully restored 1 item.'));
});
toaster.success(gettext('Successfully restored 1 item.'));
}).catch((error) => {
let errorMsg = '';
if (error.response) {
@@ -352,7 +356,6 @@ class Item extends React.Component {
}
return item.is_dir ? (
<React.Fragment>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<td className="text-center"><img src={Utils.getFolderIconUrl()} alt={gettext('Directory')} width="24" /></td>
<td><a href="#" onClick={this.renderFolder}>{item.obj_name}</a></td>
@@ -362,9 +365,7 @@ class Item extends React.Component {
<a href="#" className={isIconShown ? '': 'invisible'} onClick={this.restoreItem}>{gettext('Restore')}</a>
</td>
</tr>
</React.Fragment>
) : (
<React.Fragment>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<td className="text-center"><img src={Utils.getFileIconUrl(item.obj_name)} alt={gettext('File')} width="24" /></td>
<td><a href={`${siteRoot}repo/${repoID}/trash/files/?obj_id=${item.obj_id}&commit_id=${item.commit_id}&base=${encodeURIComponent(item.parent_dir)}&p=${encodeURIComponent('/' + item.obj_name)}`} target="_blank">{item.obj_name}</a></td>
@@ -374,7 +375,6 @@ class Item extends React.Component {
<a href="#" className={isIconShown ? '': 'invisible'} onClick={this.restoreItem}>{gettext('Restore')}</a>
</td>
</tr>
</React.Fragment>
);
}
}
@@ -410,7 +410,6 @@ class FolderItem extends React.Component {
const { commitID, baseDir, folderPath } = this.props;
return item.type == 'dir' ? (
<React.Fragment>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<td className="text-center"><img src={Utils.getFolderIconUrl()} alt={gettext('Directory')} width="24" /></td>
<td><a href="#" onClick={this.renderFolder}>{item.name}</a></td>
@@ -418,9 +417,7 @@ class FolderItem extends React.Component {
<td></td>
<td></td>
</tr>
</React.Fragment>
) : (
<React.Fragment>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<td className="text-center"><img src={Utils.getFileIconUrl(item.name)} alt={gettext('File')} width="24" /></td>
<td><a href={`${siteRoot}repo/${repoID}/trash/files/?obj_id=${item.obj_id}&commit_id=${commitID}&base=${encodeURIComponent(baseDir)}&p=${encodeURIComponent(Utils.joinPath(folderPath, item.name))}`} target="_blank">{item.name}</a></td>
@@ -428,7 +425,6 @@ class FolderItem extends React.Component {
<td>{Utils.bytesToSize(item.size)}</td>
<td></td>
</tr>
</React.Fragment>
);
}
}