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

Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore

Browse Source
This commit is contained in:
Nikita Gopienko 2019-11-08 11:29:03 +03:00
commit b66970c03a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
View File

@ -60,9 +60,9 @@ class Customization extends React.Component {
isLoadedData: false, isLoadedData: false,
isLoading: false, isLoading: false,
timezones, timezones,
timezone: findSelectedItemByKey(timezones, portalTimeZoneId), timezone: findSelectedItemByKey(timezones, portalTimeZoneId || timezones[0]),
languages, languages,
language: findSelectedItemByKey(languages, portalLanguage), language: findSelectedItemByKey(languages, portalLanguage || languages[0]),
greetingTitle: greetingSettings, greetingTitle: greetingSettings,
isLoadingGreetingSave: false, isLoadingGreetingSave: false,
isLoadingGreetingRestore: false, isLoadingGreetingRestore: false,

2
web/ASC.Web.Client/src/helpers/confirmRoute.js
View File

@ -23,7 +23,7 @@ class ConfirmRoute extends React.Component {
if (forUnauthorized && new Cookies().get(AUTH_KEY)) if (forUnauthorized && new Cookies().get(AUTH_KEY))
//TODO: Remove cookie getting after setup on server //TODO: Remove cookie getting after setup on server
return history.push(`/error=Access error`); return history.push(`/error=Access error. You should be unauthorized for performing this action`);
const { location, isAuthenticated } = this.props; const { location, isAuthenticated } = this.props;
const { search } = location; const { search } = location;