diff --git a/pkg/controller/account/search.go b/pkg/controller/account/search.go index 834d2a4..a9bb18a 100644 --- a/pkg/controller/account/search.go +++ b/pkg/controller/account/search.go @@ -92,7 +92,8 @@ func Search() http.HandlerFunc { Orientation: orientation, MaritalStatus: maritalStatus, HereFor: hereFor, - Certified: isCertified != "false", + Certified: isCertified == "true", + NotCertified: isCertified == "false", InnerCircle: isCertified == "circle", ShyAccounts: isCertified == "shy", Friends: friendSearch, diff --git a/pkg/models/user.go b/pkg/models/user.go index 3e94087..b641dcf 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -165,6 +165,7 @@ type UserSearch struct { MaritalStatus string HereFor string Certified bool + NotCertified bool InnerCircle bool ShyAccounts bool Friends bool @@ -272,6 +273,12 @@ func SearchUsers(user *User, search *UserSearch, pager *Pagination) ([]*User, er placeholders = append(placeholders, search.Certified, UserStatusActive) } + // Expressly Not Certified filtering + if search.NotCertified { + wheres = append(wheres, "certified = ?", "status = ?") + placeholders = append(placeholders, false, UserStatusActive) + } + if search.InnerCircle { wheres = append(wheres, "inner_circle = ? OR is_admin = ?") placeholders = append(placeholders, true, true) diff --git a/web/templates/account/search.html b/web/templates/account/search.html index 7b8c741..2b67792 100644 --- a/web/templates/account/search.html +++ b/web/templates/account/search.html @@ -86,7 +86,8 @@ {{end}} - + +