From cf6577445d2de77c0e2168c969512584bae3a9e8 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Mon, 17 Sep 2018 19:39:14 +0200
Subject: [PATCH] /namepspaces/{namespacesID}/users now also returns the user
 right

---
 models/list_users.go              | 5 +++++
 models/list_users_readall.go      | 5 -----
 models/namespace_users_readall.go | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/models/list_users.go b/models/list_users.go
index f3e52871..8df82247 100644
--- a/models/list_users.go
+++ b/models/list_users.go
@@ -18,3 +18,8 @@ type ListUser struct {
 func (ListUser) TableName() string {
 	return "users_list"
 }
+
+type userWithRight struct {
+	User  `xorm:"extends"`
+	Right UserRight `json:"right"`
+}
diff --git a/models/list_users_readall.go b/models/list_users_readall.go
index 07a91d48..e2bec7ad 100644
--- a/models/list_users_readall.go
+++ b/models/list_users_readall.go
@@ -11,11 +11,6 @@ func (ul *ListUser) ReadAll(user *User) (interface{}, error) {
 		return nil, ErrNeedToHaveListReadAccess{}
 	}
 
-	type userWithRight struct {
-		User  `xorm:"extends"`
-		Right UserRight `json:"right"`
-	}
-
 	// Get all users
 	all := []*userWithRight{}
 	err = x.
diff --git a/models/namespace_users_readall.go b/models/namespace_users_readall.go
index 3b5d498e..6b0664d8 100644
--- a/models/namespace_users_readall.go
+++ b/models/namespace_users_readall.go
@@ -12,9 +12,8 @@ func (un *NamespaceUser) ReadAll(user *User) (interface{}, error) {
 	}
 
 	// Get all users
-	all := []*User{}
+	all := []*userWithRight{}
 	err = x.
-		Select("users.*").
 		Join("INNER", "users_namespace", "user_id = users.id").
 		Where("users_namespace.namespace_id = ?", un.NamespaceID).
 		Find(&all)