From c8956251ff5d11f68bbc20cd3805e13ef81686b3 Mon Sep 17 00:00:00 2001 From: German Lena Date: Thu, 13 Oct 2016 16:07:38 -0300 Subject: [PATCH 1/2] Single AD connection without domain shows undefined in message #627 --- src/connection/enterprise/hrd_screen.jsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/connection/enterprise/hrd_screen.jsx b/src/connection/enterprise/hrd_screen.jsx index 56dd1b428..d22a3f168 100644 --- a/src/connection/enterprise/hrd_screen.jsx +++ b/src/connection/enterprise/hrd_screen.jsx @@ -7,7 +7,18 @@ import { enterpriseDomain, isSingleHRDConnection } from '../enterprise'; import * as i18n from '../../i18n'; const Component = ({i18n, model}) => { - const headerText = i18n.html("enterpriseActiveLoginInstructions", enterpriseDomain(model)) || null; + const domain = enterpriseDomain(model); + + var headerText; + + if (domain) { + headerText = i18n.html("enterpriseActiveLoginInstructions", domain); + } else { + headerText = i18n.html("enterpriseLoginIntructions"); + } + + headerText = headerText || null; + const header = headerText &&

{headerText}

; return ( From 4f19de72ec1cf010128781edf3e8997e03f1d7fd Mon Sep 17 00:00:00 2001 From: German Lena Date: Mon, 17 Oct 2016 11:59:07 -0300 Subject: [PATCH 2/2] changed null validation --- src/connection/enterprise/hrd_screen.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connection/enterprise/hrd_screen.jsx b/src/connection/enterprise/hrd_screen.jsx index d22a3f168..64e622ddf 100644 --- a/src/connection/enterprise/hrd_screen.jsx +++ b/src/connection/enterprise/hrd_screen.jsx @@ -11,7 +11,7 @@ const Component = ({i18n, model}) => { var headerText; - if (domain) { + if (domain != null) { headerText = i18n.html("enterpriseActiveLoginInstructions", domain); } else { headerText = i18n.html("enterpriseLoginIntructions");