From da7dcfee6affa0dc02255bcbd6669dce606dbd26 Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Thu, 7 Nov 2019 14:07:00 +0900
Subject: [PATCH] Move admin template IsSuspended logic into method

This adds a User.IsSuspended() method and uses it when displaying the
user's status on admin pages, instead of doing a magic number check.
This should also help in the future, in case this logic ever changes.

Ref T661
---
 templates/user/admin/users.tmpl     |  5 ++---
 templates/user/admin/view-user.tmpl | 11 ++++++-----
 users.go                            |  4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/templates/user/admin/users.tmpl b/templates/user/admin/users.tmpl
index 6d5d6f7..03a3f6c 100644
--- a/templates/user/admin/users.tmpl
+++ b/templates/user/admin/users.tmpl
@@ -19,9 +19,8 @@
 			<td>{{.CreatedFriendly}}</td>
 			<td style="text-align:center">{{if .IsAdmin}}Admin{{else}}User{{end}}</td>
 			<td style="text-align:center">
-				<a 
-				href="/admin/user/{{.Username}}#status"
-				title="View or change account status">{{if eq .Status 1}}suspended{{else}}active{{end}}</a></td>
+				<a href="/admin/user/{{.Username}}#status" title="View or change account status">{{if .IsSuspended}}suspended{{else}}active{{end}}</a>
+			</td>
 		</tr>
 		{{end}}
 	</table>
diff --git a/templates/user/admin/view-user.tmpl b/templates/user/admin/view-user.tmpl
index 01eb1f0..9226c39 100644
--- a/templates/user/admin/view-user.tmpl
+++ b/templates/user/admin/view-user.tmpl
@@ -60,14 +60,15 @@ td.active-suspend > input[type="submit"] {
 			<form action="/admin/user/{{.User.Username}}/status" method="POST">
 				<a id="status"/>
 				<th>Status</th>
-				{{if eq .User.Status 1}}
-				<td class="active-suspend"><p>User is currently Suspended</p><input type="submit" value="Activate"/></td>
-				{{else}}
 				<td class="active-suspend">
-					<p>User is currently Active</p>
+				{{if .User.IsSuspended}}
+					<p>Suspended</p>
+					<input type="submit" value="Activate"/>
+				{{else}}
+					<p>Active</p>
 					<input class="danger" type="submit" value="Suspend" {{if .User.IsAdmin}}disabled{{end}}/>
-				</td>
 				{{end}}
+				</td>
 			</form>
 		</tr>
 	</table>
diff --git a/users.go b/users.go
index 05b5bb4..5eb2e61 100644
--- a/users.go
+++ b/users.go
@@ -126,3 +126,7 @@ func (u *User) IsAdmin() bool {
 	// TODO: get this from database
 	return u.ID == 1
 }
+
+func (u *User) IsSuspended() bool {
+	return u.Status&UserSuspended != 0
+}