From 072ca0dfedc7361e3ab9b5e9c2609801af631dd0 Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Mon, 13 May 2019 16:50:20 +0100
Subject: [PATCH] Ensure user admin works for new dual login mode

---
 gui/app/templates/components/customize/user-admin.hbs | 2 +-
 gui/app/templates/components/customize/user-list.hbs  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/app/templates/components/customize/user-admin.hbs b/gui/app/templates/components/customize/user-admin.hbs
index 36438d18..85909189 100644
--- a/gui/app/templates/components/customize/user-admin.hbs
+++ b/gui/app/templates/components/customize/user-admin.hbs
@@ -1,5 +1,5 @@
 <div class="view-customize">
-	{{#if (or isAuthProviderDocumize IsDualAuth)}}
+	{{#if (or isAuthProviderDocumize isDualAuth)}}
 		{{ui/ui-button color=constants.Color.Green light=true icon=constants.Icon.Person label=constants.Label.Add onClick=(action "onOpenUserModal")}}
 		<div id="add-user-modal" class="modal" tabindex="-1" role="dialog">
 			<div class="modal-dialog modal-lg" role="document">
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs
index fc971ce4..075425f0 100644
--- a/gui/app/templates/components/customize/user-list.hbs
+++ b/gui/app/templates/components/customize/user-list.hbs
@@ -1,5 +1,5 @@
 <div class="view-customize">
-	{{#if (or isAuthProviderKeycloak isDualAuth)}}
+	{{#if isAuthProviderKeycloak}}
 		{{ui/ui-spacer size=300}}
 		{{#if syncInProgress}}
 			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="Keycloak user sync running..."}}
@@ -8,7 +8,7 @@
 		{{/if}}
 	{{/if}}
 
-	{{#if isAuthProviderLDAP}}
+	{{#if (or isAuthProviderLDAP c)}}
 		{{ui/ui-spacer size=300}}
 		{{#if syncInProgress}}
 			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="LDAP user sync running..."}}
@@ -187,7 +187,7 @@
 						<label for="edit-email">Email</label>
 						{{input id="edit-email" type="text" class="form-control" value=editUser.email}}
 					</div>
-					{{#if (or isAuthProviderDocumize IsDualAuth)}}
+					{{#if (or isAuthProviderDocumize isDualAuth)}}
 						<div class="form-group">
 							<label for="edit-password">Password</label>
 							{{input id="edit-password" type="password" class="form-control" value=password.password}}