haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 15:53:28 +00:00
Code Issues Releases Wiki Activity

[repo/folder trash] update

Browse Source
This commit is contained in:
llj
2019-06-06 12:13:03 +08:00
parent 217278710b
commit dd965abbb0
1 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
frontend/src/repo-folder-trash.js
View File

@@ -78,6 +78,9 @@ class RepoFolderTrash extends React.Component {
} }
getMore = () => { getMore = () => {
this.setState({
isLoading: true
});
this.getItems(this.state.scanStat); this.getItems(this.state.scanStat);
} }
@@ -325,7 +328,8 @@ class Item extends React.Component {
request.then((res) => { request.then((res) => {
this.setState({ this.setState({
restored: true restored: true
}); toaster.success(gettext('Successfully restored 1 item.')); });
toaster.success(gettext('Successfully restored 1 item.'));
}).catch((error) => { }).catch((error) => {
let errorMsg = ''; let errorMsg = '';
if (error.response) { if (error.response) {
@@ -352,29 +356,25 @@ class Item extends React.Component {
} }
return item.is_dir ? ( return item.is_dir ? (
<React.Fragment> <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}> <td className="text-center"><img src={Utils.getFolderIconUrl()} alt={gettext('Directory')} width="24" /></td>
<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>
<td><a href="#" onClick={this.renderFolder}>{item.obj_name}</a></td> <td title={moment(item.deleted_time).format('LLLL')}>{moment(item.deleted_time).format('YYYY-MM-DD')}</td>
<td title={moment(item.deleted_time).format('LLLL')}>{moment(item.deleted_time).format('YYYY-MM-DD')}</td> <td></td>
<td></td> <td>
<td> <a href="#" className={isIconShown ? '': 'invisible'} onClick={this.restoreItem}>{gettext('Restore')}</a>
<a href="#" className={isIconShown ? '': 'invisible'} onClick={this.restoreItem}>{gettext('Restore')}</a> </td>
</td> </tr>
</tr>
</React.Fragment>
) : ( ) : (
<React.Fragment> <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<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 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>
<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> <td title={moment(item.deleted_time).format('LLLL')}>{moment(item.deleted_time).format('YYYY-MM-DD')}</td>
<td title={moment(item.deleted_time).format('LLLL')}>{moment(item.deleted_time).format('YYYY-MM-DD')}</td> <td>{Utils.bytesToSize(item.size)}</td>
<td>{Utils.bytesToSize(item.size)}</td> <td>
<td> <a href="#" className={isIconShown ? '': 'invisible'} onClick={this.restoreItem}>{gettext('Restore')}</a>
<a href="#" className={isIconShown ? '': 'invisible'} onClick={this.restoreItem}>{gettext('Restore')}</a> </td>
</td> </tr>
</tr>
</React.Fragment>
); );
} }
} }
@@ -410,25 +410,21 @@ class FolderItem extends React.Component {
const { commitID, baseDir, folderPath } = this.props; const { commitID, baseDir, folderPath } = this.props;
return item.type == 'dir' ? ( return item.type == 'dir' ? (
<React.Fragment> <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}> <td className="text-center"><img src={Utils.getFolderIconUrl()} alt={gettext('Directory')} width="24" /></td>
<td className="text-center"><img src={Utils.getFolderIconUrl()} alt={gettext('Directory')} width="24" /></td> <td><a href="#" onClick={this.renderFolder}>{item.name}</a></td>
<td><a href="#" onClick={this.renderFolder}>{item.name}</a></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> </tr>
</tr>
</React.Fragment>
) : ( ) : (
<React.Fragment> <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}> <td className="text-center"><img src={Utils.getFileIconUrl(item.name)} alt={gettext('File')} width="24" /></td>
<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>
<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> <td></td>
<td></td> <td>{Utils.bytesToSize(item.size)}</td>
<td>{Utils.bytesToSize(item.size)}</td> <td></td>
<td></td> </tr>
</tr>
</React.Fragment>
); );
} }
} }