From 648a5746dd21fdd29d9253d34794365402c312c3 Mon Sep 17 00:00:00 2001
From: xiahaoshawn <haox@vmware.com>
Date: Tue, 10 May 2016 10:58:43 +0800
Subject: [PATCH] make a combination in if condition

---
 controllers/base.go              | 2 --
 views/segment/header-content.tpl | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/controllers/base.go b/controllers/base.go
index a5edae407..7d4b3e535 100644
--- a/controllers/base.go
+++ b/controllers/base.go
@@ -127,8 +127,6 @@ func (b *BaseController) Prepare() {
 			log.Errorf("Error occurred in IsAdminRole:%v", err)
 			b.CustomAbort(http.StatusInternalServerError, "Internal error.")
 		}
-	}else {
-		b.IsLdapAdminUser = false
 	}
 
 	b.Data["IsAdmin"] = b.IsAdmin
diff --git a/views/segment/header-content.tpl b/views/segment/header-content.tpl
index d5ee8b9d2..f9d2d619f 100644
--- a/views/segment/header-content.tpl
+++ b/views/segment/header-content.tpl
@@ -57,12 +57,10 @@
 						<li><a id="aChangePassword" href="/changePassword" target="_blank"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{{i18n .Lang "change_password"}}</a></li>
 						<li role="separator" class="divider"></li>
 						{{ end }}
-						  {{ if eq .AuthMode "ldap_auth" }}
-							  {{ if eq .IsLdapAdminUser true }}
+							{{ if eq .IsLdapAdminUser true }}
 						<li><a id="aChangePassword" href="/changePassword" target="_blank"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{{i18n .Lang "change_password"}}</a></li>
 						<li role="separator" class="divider"></li>
-						    {{ end }} 
-						{{ end }}
+						{{ end }} 
 						{{ if eq .AuthMode "db_auth" }}
 						  {{ if eq .IsAdmin true }}
 						    <li><a id="aAddUser" href="/addUser" target="_blank"><span class="glyphicon glyphicon-plus"></span>&nbsp;&nbsp;{{i18n .Lang "add_user"}}</a></li>