From 9640752d20666373165d1f8bb3f3ddb8378353c3 Mon Sep 17 00:00:00 2001 From: Artem Baskal Date: Fri, 3 Jul 2020 11:45:56 +0300 Subject: [PATCH] - client: Don't normalise disallowed domains Close #1820 Squashed commit of the following: commit 0c758ddcd738136b92e6f947a8068ecc59f7ec25 Merge: 15650db3 f5a1f311 Author: ArtemBaskal Date: Fri Jul 3 11:22:00 2020 +0300 Merge branch 'master' into fix/1820 commit 15650db35323009001fd427a74a312705b54ac86 Author: ArtemBaskal Date: Mon Jun 29 12:01:51 2020 +0300 '- client: Don't normalise disallowed domains' --- client/src/components/Header/Menu.js | 2 +- client/src/components/Settings/Dns/Access/Form.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/Header/Menu.js b/client/src/components/Header/Menu.js index e65faf2d..5e5e449d 100644 --- a/client/src/components/Header/Menu.js +++ b/client/src/components/Header/Menu.js @@ -37,8 +37,8 @@ const FILTERS_ITEMS = [ { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' }, { route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' }, { route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' }, - { route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' }, { route: FILTERS_URLS.blocked_services, text: 'blocked_services' }, + { route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' }, ]; class Menu extends Component { diff --git a/client/src/components/Settings/Dns/Access/Form.js b/client/src/components/Settings/Dns/Access/Form.js index bd7ca897..8edc3189 100644 --- a/client/src/components/Settings/Dns/Access/Form.js +++ b/client/src/components/Settings/Dns/Access/Form.js @@ -46,7 +46,7 @@ const Form = (props) => { type="text" className="form-control form-control--textarea font-monospace" disabled={disabled} - normalizeOnBlur={normalizeMultiline} + normalizeOnBlur={id === 'disallowed_clients' ? normalizeMultiline : undefined} /> ;