ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 05:19:05 +01:00
Code Issues Packages Releases Activity

Add support role to tag count

Browse Source 
- works equal to admin
This commit is contained in:
Christoph Kluge 2023-01-30 13:48:27 +01:00
parent 2590ce7e44
commit c4d91039e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/repository/tags.go
View File

@ -82,7 +82,7 @@ func (r *JobRepository) CountTags(user *string, project *string) (tags []schema.
q = q.Where("jt.job_id IN (SELECT id FROM job WHERE job.user = ?)", *user) q = q.Where("jt.job_id IN (SELECT id FROM job WHERE job.user = ?)", *user)
} else if (user != nil && project != nil) { // MANAGER: Count own jobs plus project's jobs } else if (user != nil && project != nil) { // MANAGER: Count own jobs plus project's jobs
q = q.Where("jt.job_id IN (SELECT id FROM job WHERE job.user = ? OR job.project = ?)", *user, *project) q = q.Where("jt.job_id IN (SELECT id FROM job WHERE job.user = ? OR job.project = ?)", *user, *project)
} // else: ADMIN: Count all jobs } // else: ADMIN || SUPPORT: Count all jobs
rows, err := q.RunWith(r.stmtCache).Query() rows, err := q.RunWith(r.stmtCache).Query()
if err != nil { if err != nil {

4
internal/routerConfig/routes.go
View File

@ -149,12 +149,12 @@ func setupTaglistRoute(i InfoType, r *http.Request) InfoType {
jobRepo := repository.GetJobRepository() jobRepo := repository.GetJobRepository()
user := auth.GetUser(r.Context()) user := auth.GetUser(r.Context())
if (user != nil && user.HasNotRoles([]string{auth.RoleAdmin, auth.RoleManager})) { if (user != nil && user.HasNotRoles([]string{auth.RoleAdmin, auth.RoleSupport, auth.RoleManager})) {
username = &user.Username username = &user.Username
} else if (user != nil && user.HasRole(auth.RoleManager)) { } else if (user != nil && user.HasRole(auth.RoleManager)) {
username = &user.Username username = &user.Username
project = &user.Project project = &user.Project
} } // ADMINS && SUPPORT w/o additional conditions
tags, counts, err := jobRepo.CountTags(username, project) tags, counts, err := jobRepo.CountTags(username, project)
tagMap := make(map[string][]map[string]interface{}) tagMap := make(map[string][]map[string]interface{})