From 18cea4e7966081994a9d79caa645608700a8de47 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Thu, 5 Nov 2020 11:34:37 -0800
Subject: [PATCH 1/3] Show pills for realm/system admin

---
 cmd/server/assets/admin/users/index.html | 9 ++++++++-
 pkg/database/user.go                     | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cmd/server/assets/admin/users/index.html b/cmd/server/assets/admin/users/index.html
index 8b7107582..4f45d34fd 100644
--- a/cmd/server/assets/admin/users/index.html
+++ b/cmd/server/assets/admin/users/index.html
@@ -44,7 +44,14 @@
             <tbody>
             {{range $users}}
               <tr>
-                <td>{{.Name}}</td>
+                <td>
+                  {{.Name}}
+                  {{if .Admin}}
+                  <span class="ml-1 badge badge-pill badge-primary">System admin</span>
+                  {{else if .IsRealmAdmin}}
+                  <span class="ml-1 badge badge-pill badge-secondary">Realm admin</span>
+                  {{end}}
+                </td>
                 <td>{{.Email}}</td>
                 <td class="text-center">
                   {{- /* cannot delete yourself */ -}}
diff --git a/pkg/database/user.go b/pkg/database/user.go
index b9f0b34da..455e89c92 100644
--- a/pkg/database/user.go
+++ b/pkg/database/user.go
@@ -133,6 +133,10 @@ func (u *User) CanViewRealm(realmID uint) bool {
 	return false
 }
 
+func (u *User) IsRealmAdmin() bool {
+	return len(u.AdminRealms) > 0
+}
+
 func (u *User) CanAdminRealm(realmID uint) bool {
 	for _, r := range u.AdminRealms {
 		if r.ID == realmID {
@@ -235,7 +239,6 @@ func (db *Database) DeleteUser(u *User) error {
 func (db *Database) ListUsers(p *pagination.PageParams, q string) ([]*User, *pagination.Paginator, error) {
 	var users []*User
 	query := db.db.Model(&User{}).
-		Where("admin IS FALSE").
 		Order("LOWER(name) ASC")
 
 	q = project.TrimSpace(q)

From fd8d64967db2128b24808276f11d1f69f342f9d6 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Thu, 5 Nov 2020 14:08:23 -0800
Subject: [PATCH 2/3] fix name

---
 cmd/server/assets/admin/users/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/server/assets/admin/users/index.html b/cmd/server/assets/admin/users/index.html
index 4f45d34fd..507e49a13 100644
--- a/cmd/server/assets/admin/users/index.html
+++ b/cmd/server/assets/admin/users/index.html
@@ -46,7 +46,7 @@
               <tr>
                 <td>
                   {{.Name}}
-                  {{if .Admin}}
+                  {{if .SystemAdmin}}
                   <span class="ml-1 badge badge-pill badge-primary">System admin</span>
                   {{else if .IsRealmAdmin}}
                   <span class="ml-1 badge badge-pill badge-secondary">Realm admin</span>

From bc790e4919d10b358b9ac1591858b8ee8b376db9 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Thu, 5 Nov 2020 17:33:35 -0800
Subject: [PATCH 3/3] both pills

---
 cmd/server/assets/admin/users/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/server/assets/admin/users/index.html b/cmd/server/assets/admin/users/index.html
index 507e49a13..3fef23ada 100644
--- a/cmd/server/assets/admin/users/index.html
+++ b/cmd/server/assets/admin/users/index.html
@@ -48,7 +48,8 @@
                   {{.Name}}
                   {{if .SystemAdmin}}
                   <span class="ml-1 badge badge-pill badge-primary">System admin</span>
-                  {{else if .IsRealmAdmin}}
+                  {{end}}
+                  {{if .IsRealmAdmin}}
                   <span class="ml-1 badge badge-pill badge-secondary">Realm admin</span>
                   {{end}}
                 </td>