test

models/user.go

@@ -37,11 +37,9 @@ type UserGroup struct {
 
 type UserSafe struct {
 	User
-	AdminUser  bool   `db:"AdminUser"`
-	AdminGroup bool   `db:"AdminGroup"`
-	SafeId     int    `db:"SafeId"`
-	SafeName   string `db:"SafeName"`
-	GroupId    int    `db:"GroupId"`
+	SafeId   int    `db:"SafeId"`
+	SafeName string `db:"SafeName"`
+	GroupId  int    `db:"GroupId"`
 }
 
 func (u *User) SaveUser() (*User, error) {
@@ -360,7 +358,6 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
 	// join users, groups and permissions
 	rows, err := db.Queryx(`
 	SELECT users.UserId, users.GroupId,
-	groups.Admin as AdminGroup,
 	permissions.SafeId, safes.SafeName FROM users
 	INNER JOIN groups ON users.GroupId = groups.GroupId
 	INNER JOIN permissions ON groups.GroupId = permissions.GroupId