Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
This commit is contained in:
commit
09c4303ca6
@ -6,6 +6,8 @@ import { Button, TextInput, PageLayout, Text, PasswordInput, FieldContainer, toa
|
|||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
import { welcomePageTitle } from './../../../helpers/customNames';
|
import { welcomePageTitle } from './../../../helpers/customNames';
|
||||||
|
|
||||||
|
const inputWidth = '400px';
|
||||||
|
|
||||||
const ConfirmContainer = styled.div`
|
const ConfirmContainer = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@ -34,7 +36,7 @@ const ConfirmContainer = styled.div`
|
|||||||
|
|
||||||
|
|
||||||
input {
|
input {
|
||||||
width: 400px;
|
width: ${inputWidth};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -51,6 +53,7 @@ const passwordSettings = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const emailInputName = 'email';
|
const emailInputName = 'email';
|
||||||
|
const passwordInputName = 'password';
|
||||||
|
|
||||||
const isLoaded = true;
|
const isLoaded = true;
|
||||||
|
|
||||||
@ -95,7 +98,7 @@ const Confirm = (props) => {
|
|||||||
hasError = true;
|
hasError = true;
|
||||||
setEmailValid(!hasError);
|
setEmailValid(!hasError);
|
||||||
}
|
}
|
||||||
const passwordValue = (document.getElementsByName('password')[0].value);
|
const passwordValue = (document.getElementsByName(passwordInputName)[0].value);
|
||||||
if (!passwordValue || !passwordValid) {
|
if (!passwordValue || !passwordValid) {
|
||||||
hasError = true;
|
hasError = true;
|
||||||
setPasswordValid(!hasError);
|
setPasswordValid(!hasError);
|
||||||
@ -218,7 +221,7 @@ const Confirm = (props) => {
|
|||||||
|
|
||||||
<FieldContainer isVertical={true} className=''>
|
<FieldContainer isVertical={true} className=''>
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
inputName="password"
|
inputName={passwordInputName}
|
||||||
emailInputName={emailInputName}
|
emailInputName={emailInputName}
|
||||||
inputValue={password}
|
inputValue={password}
|
||||||
placeholder={t('InvitePassword')}
|
placeholder={t('InvitePassword')}
|
||||||
@ -226,7 +229,7 @@ const Confirm = (props) => {
|
|||||||
scale={true}
|
scale={true}
|
||||||
tabIndex={4}
|
tabIndex={4}
|
||||||
maxLength={30}
|
maxLength={30}
|
||||||
inputWidth='400px'
|
inputWidth={inputWidth}
|
||||||
hasError={!passwordValid}
|
hasError={!passwordValid}
|
||||||
onChange={event => {
|
onChange={event => {
|
||||||
setPassword(event.target.value);
|
setPassword(event.target.value);
|
||||||
|
@ -519,12 +519,12 @@ namespace ASC.Web.Studio.Utility
|
|||||||
|
|
||||||
if (!string.IsNullOrEmpty(email))
|
if (!string.IsNullOrEmpty(email))
|
||||||
{
|
{
|
||||||
link += $"email={HttpUtility.UrlEncode(email)}";
|
link += $"&email={HttpUtility.UrlEncode(email)}";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (userId != default)
|
if (userId != default)
|
||||||
{
|
{
|
||||||
link += $"uid={userId}";
|
link += $"&uid={userId}";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (postfix != null)
|
if (postfix != null)
|
||||||
|
Loading…
Reference in New Issue
Block a user