Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files

This commit is contained in:
Alexey Safronov 2020-07-09 15:59:02 +03:00
commit 8a4d7a4da2

View File

@ -282,7 +282,7 @@ class SectionBodyContent extends React.Component {
}
showVersionHistory = (e) => {
const {settings, history} = this.props;
const { settings, history } = this.props;
const fileId = e.currentTarget.dataset.id;
history.push(`${settings.homepage}/${fileId}/history`);
@ -422,7 +422,10 @@ class SectionBodyContent extends React.Component {
svgLoader = () => <div style={{ width: '24px' }}></div>;
getItemIcon = (item, isEdit) => {
const extension = item.fileExst;
const { fileAction } = this.props;
const actionExtension = fileAction.extension && `.${fileAction.extension}`;
const extension = isEdit ? actionExtension : item.fileExst;
const icon = extension
? getFileIcon(extension, 24)
: getFolderIcon(item.providerKey, 24);