This commit is contained in:
@@ -41,7 +41,7 @@ type UserSafe struct {
|
|||||||
User
|
User
|
||||||
SafeId int `db:"SafeId"`
|
SafeId int `db:"SafeId"`
|
||||||
SafeName string `db:"SafeName"`
|
SafeName string `db:"SafeName"`
|
||||||
GroupId int `db:"GroupId"`
|
//GroupId int `db:"GroupId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) SaveUser() (*User, error) {
|
func (u *User) SaveUser() (*User, error) {
|
||||||
@@ -365,12 +365,12 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
|
|||||||
INNER JOIN permissions ON groups.GroupId = permissions.GroupId
|
INNER JOIN permissions ON groups.GroupId = permissions.GroupId
|
||||||
INNER JOIN safes on permissions.SafeId = safes.SafeId
|
INNER JOIN safes on permissions.SafeId = safes.SafeId
|
||||||
WHERE users.UserId=?`, userId)
|
WHERE users.UserId=?`, userId)
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("UserGetSafesAllowed error executing sql record : '%s'\n", err)
|
log.Printf("UserGetSafesAllowed error executing sql record : '%s'\n", err)
|
||||||
return results, err
|
return results, err
|
||||||
} else {
|
} else {
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
// Get columns from rows for debugging
|
// Get columns from rows for debugging
|
||||||
columns, err := rows.Columns()
|
columns, err := rows.Columns()
|
||||||
@@ -378,6 +378,7 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
|
|||||||
log.Printf("UserGetSafesAllowed error getting column listing : '%s'\n", err)
|
log.Printf("UserGetSafesAllowed error getting column listing : '%s'\n", err)
|
||||||
return results, err
|
return results, err
|
||||||
}
|
}
|
||||||
|
log.Printf("columns: %v\n", columns)
|
||||||
|
|
||||||
// parse all the results into a slice
|
// parse all the results into a slice
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
@@ -404,6 +405,7 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Print the raw row record
|
// Print the raw row record
|
||||||
|
log.Println("-----------")
|
||||||
for _, column := range columns {
|
for _, column := range columns {
|
||||||
log.Printf("%s: %v\n", column, rowValues[column])
|
log.Printf("%s: %v\n", column, rowValues[column])
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user