This commit is contained in:
Artem Tarasov 2020-08-12 11:54:08 +03:00
parent bcda6bf69f
commit 1503bc105b
3 changed files with 11 additions and 5 deletions

View File

@ -152,7 +152,6 @@ class Body extends Component {
])
.then(() => setIsWizardLoaded(true))
.catch((e) => {
console.log(e)
this.setState({
errorInitWizard: e
})});
@ -344,7 +343,8 @@ class Body extends Component {
machineName,
settingsPassword,
language,
isLicenseRequired
isLicenseRequired,
urlLicense
} = this.props;
const {
@ -405,6 +405,7 @@ class Body extends Component {
hasErrorEmail={hasErrorEmail}
hasErrorPass={hasErrorPass}
hasErrorLicense={hasErrorLicense}
urlLicense={urlLicense}
onChangeLicense={this.onChangeLicense}
isValidPassHandler={this.isValidPassHandler}
onChangePassword={this.onChangePassword}
@ -487,6 +488,7 @@ function mapStateToProps(state) {
timezones: state.auth.settings.timezones,
portalTimezone: state.auth.settings.timezone,
urlLicense: state.auth.settings.urlLicense,
isLicenseRequired: state.wizard.isLicenseRequired,
licenseUpload: state.wizard.licenseUpload

View File

@ -58,7 +58,8 @@ const InputContainer = ({
isLicenseRequired,
hasErrorEmail,
hasErrorPass,
hasErrorLicense
hasErrorLicense,
urlLicense
}) => {
const refPassInput = useRef(null);
@ -146,7 +147,8 @@ const InputContainer = ({
type="page"
color="#116d9d"
fontSize="13px"
href="https://gnu.org/licenses/gpl-3.0.html"
target="_blank"
href={urlLicense ? urlLicense : "https://gnu.org/licenses/gpl-3.0.html"}
isBold={false}
>{t('licenseLink')}</Link>
</Box>
@ -164,7 +166,8 @@ InputContainer.propTypes = {
onChangePassword: PropTypes.func.isRequired,
isValidPassHandler: PropTypes.func.isRequired,
license: PropTypes.bool.isRequired,
onChangeLicense: PropTypes.func.isRequired
onChangeLicense: PropTypes.func.isRequired,
urlLicense: PropTypes.string
};
export default InputContainer;

View File

@ -31,6 +31,7 @@ const initialState = {
},
greetingSettings: 'Web Office Applications',
enableAdmMess: false,
urlLicense: "https://gnu.org/licenses/gpl-3.0.html"
}
}