Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4

This commit is contained in:
Alexey Kostenko 2020-12-22 18:13:37 +03:00
commit 5f7f0b52f0
4 changed files with 13 additions and 6 deletions

View File

@ -182,12 +182,15 @@ class FilesRowContent extends React.PureComponent {
!item.fileExst
? createFolder(item.parentId, itemTitle)
.then(() => this.completeAction(itemId))
.finally(() => {
.then(() =>
toastr.success(
<Trans i18nKey="FolderCreated" i18n={i18n}>
New folder {{ itemTitle }} is created
</Trans>
);
)
)
.catch((e) => toastr.error(e))
.finally(() => {
return setIsLoading(false);
})
: createFile(item.parentId, `${itemTitle}.${item.fileExst}`)
@ -195,13 +198,16 @@ class FilesRowContent extends React.PureComponent {
openDocEditor(file.id, tab, file.webUrl);
this.completeAction(itemId);
})
.finally(() => {
.then(() => {
const exst = item.fileExst;
toastr.success(
return toastr.success(
<Trans i18nKey="FileCreated" i18n={i18n}>
New file {{ itemTitle }}.{{ exst }} is created
</Trans>
);
})
.catch((e) => toastr.error(e))
.finally(() => {
return setIsLoading(false);
});
};

View File

@ -132,7 +132,7 @@ export const isSound = (extension) => {
};
export const isVideo = (extension) => {
return createSelector(getVideoFormats, (formats) => {
return createSelector(getMediaViewerMediaFormats, (formats) => {
return presentInArray(formats, extension);
});
};

View File

@ -456,7 +456,7 @@ namespace ASC.Employee.Core.Controllers
UpdateContacts(memberModel.Contacts, user);
user = UserManagerWrapper.AddUser(user, memberModel.PasswordHash, false, true, memberModel.IsVisitor);
user = UserManagerWrapper.AddUser(user, memberModel.PasswordHash, memberModel.FromInviteLink, true, memberModel.IsVisitor, memberModel.FromInviteLink);
var messageAction = memberModel.IsVisitor ? MessageAction.GuestCreated : MessageAction.UserCreated;
MessageService.Send(messageAction, MessageTarget.Create(user.ID), user.DisplayUserName(false, DisplayUserSettingsHelper));

View File

@ -24,6 +24,7 @@ namespace ASC.People.Models
public string Files { get; set; }
public string Password { get; set; }
public string PasswordHash { get; set; }
public bool FromInviteLink { get; set; }
}
public class UpdateMemberModel : MemberModel