daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/2152

Browse Source
This commit is contained in:
ArtemBaskal
2020-10-06 20:22:51 +03:00
parent c98f18747c fb7ca94243
commit f3118c5e2a
8 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/Settings/Clients/Form.js
View File

@@ -15,7 +15,7 @@ import { toggleAllServices } from '../../../helpers/helpers';
import {
renderInputField,
renderGroupField,
renderCheckboxField,
CheckboxField,
renderServiceField,
} from '../../../helpers/form';
import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
@@ -151,7 +151,7 @@ let Form = (props) => {
<Field
name={setting.name}
type="checkbox"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t(setting.placeholder)}
disabled={
setting.name !== 'use_global_settings'

4
client/src/components/Settings/Dns/Config/Form.js
View File

@@ -6,7 +6,7 @@ import { Trans, useTranslation } from 'react-i18next';
import {
renderInputField,
renderRadioField,
renderCheckboxField,
CheckboxField,
toNumber,
} from '../../../../helpers/form';
import {
@@ -97,7 +97,7 @@ const Form = ({
<Field
name={name}
type="checkbox"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}

6
client/src/components/Settings/Encryption/Form.js
View File

@@ -7,7 +7,7 @@ import flow from 'lodash/flow';
import {
renderInputField,
renderCheckboxField,
CheckboxField,
renderRadioField,
toNumber,
} from '../../../helpers/form';
@@ -101,7 +101,7 @@ let Form = (props) => {
<Field
name="enabled"
type="checkbox"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t('encryption_enable')}
onChange={handleChange}
/>
@@ -138,7 +138,7 @@ let Form = (props) => {
<Field
name="force_https"
type="checkbox"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t('encryption_redirect')}
onChange={handleChange}
disabled={!isEnabled}

4
client/src/components/Settings/FiltersConfig/Form.js
View File

@@ -4,7 +4,7 @@ import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderCheckboxField, toNumber } from '../../../helpers/form';
import { CheckboxField, toNumber } from '../../../helpers/form';
import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants';
const getTitleForInterval = (interval, t) => {
@@ -49,7 +49,7 @@ const Form = (props) => {
name="enabled"
type="checkbox"
modifier="checkbox--settings"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t('block_domain_use_filters_and_hosts')}
subtitle={t('filters_block_toggle_hint')}
onChange={handleChange}

6
client/src/components/Settings/LogsConfig/Form.js
View File

@@ -4,7 +4,7 @@ import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
import '../FormButton.css';
@@ -36,7 +36,7 @@ const Form = (props) => {
<Field
name="enabled"
type="checkbox"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t('query_log_enable')}
disabled={processing}
/>
@@ -45,7 +45,7 @@ const Form = (props) => {
<Field
name="anonymize_client_ip"
type="checkbox"
component={renderCheckboxField}
component={CheckboxField}
placeholder={t('anonymize_client_ip')}
subtitle={t('anonymize_client_ip_desc')}
disabled={processing}