ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-22 20:41:40 +02:00
Code Issues Packages Releases Activity

Fix tag panic and simplify code

Browse Source
This commit is contained in:
Christoph Kluge
2023-02-22 16:49:23 +01:00
parent d6b8d711f6
commit 365888c645
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/routerConfig/routes.go
View File

@@ -142,20 +142,10 @@ func setupAnalysisRoute(i InfoType, r *http.Request) InfoType {
}
func setupTaglistRoute(i InfoType, r *http.Request) InfoType {
var username *string = nil
var projects *[]string
jobRepo := repository.GetJobRepository()
user := auth.GetUser(r.Context())
if user != nil && user.HasNotRoles([]string{auth.RoleAdmin, auth.RoleSupport, auth.RoleManager}) {
username = &user.Username
} else if user != nil && user.HasRole(auth.RoleManager) {
username = &user.Username
projects = &user.Projects
} // ADMINS && SUPPORT w/o additional conditions
tags, counts, err := jobRepo.CountTags(username, projects)
tags, counts, err := jobRepo.CountTags(user)
tagMap := make(map[string][]map[string]interface{})
if err != nil {
log.Warnf("GetTags failed: %s", err.Error())