IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0

Browse Source
This commit is contained in:
Alexey Safronov 2021-08-11 14:23:19 +03:00
commit 8c7da2a716
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
View File

@ -122,7 +122,7 @@ class DownloadDialogComponent extends React.Component {
if (file.value) { if (file.value) {
viewUrl = `${viewUrl}&outputtype=${file.value}`; viewUrl = `${viewUrl}&outputtype=${file.value}`;
} }
window.open(viewUrl, "_blank"); window.open(viewUrl, "_self");
this.onClose(); this.onClose();
} else if (fileConvertIds.length || folderIds.length) { } else if (fileConvertIds.length || folderIds.length) {
setSecondaryProgressBarData({ setSecondaryProgressBarData({

2
products/ASC.Files/Client/src/store/FilesActionsStore.js
View File

@ -235,7 +235,7 @@ class FilesActionStore {
const items = []; const items = [];
if (selection.length === 1 && selection[0].fileExst) { if (selection.length === 1 && selection[0].fileExst) {
window.open(selection[0].viewUrl, "_blank"); window.open(selection[0].viewUrl, "_self");
return Promise.resolve(); return Promise.resolve();
} }

2
web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-actions.js
View File

@ -87,7 +87,7 @@ class ProfileActions extends React.PureComponent {
onClick={this.onClick} onClick={this.onClick}
role={userRole} role={userRole}
size="small" size="small"
source={avatar.big} source={String(avatar.big)}
userName={user.displayName} userName={user.displayName}
className="icon-profile-menu" className="icon-profile-menu"
/> />