IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move SignedInUser to user service and RoleType and Roles to org (#53445)

Browse Source 
* Move SignedInUser to user service and RoleType and Roles to org

* Use go naming convention for roles

* Fix some imports and leftovers

* Fix ldap debug test

* Fix lint

* Fix lint 2

* Fix lint 3

* Fix type and not needed conversion

* Clean up messages in api tests

* Clean up api tests 2
This commit is contained in:
idafurjes
2022-08-10 11:56:48 +02:00
committed by GitHub
parent 46004037e2
commit 6afad51761
278 changed files with 1758 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/services/sqlstore/stats.go
View File

@@ -6,6 +6,7 @@ import (
"time"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
@@ -147,7 +148,7 @@ func viewersPermissionsCounterSQL(statName string, isFolder bool, permission mod
FROM ` + dialect.Quote("dashboard_acl") + ` AS acl
INNER JOIN ` + dialect.Quote("dashboard") + ` AS d
ON d.id = acl.dashboard_id
WHERE acl.role = '` + string(models.ROLE_VIEWER) + `'
WHERE acl.role = '` + string(org.RoleViewer) + `'
AND d.is_folder = ` + dialect.BooleanStr(isFolder) + `
AND acl.permission = ` + strconv.FormatInt(int64(permission), 10) + `
) AS ` + statName + `, `
@@ -305,11 +306,11 @@ GROUP BY active, daily_active, role;`
memo := memoUserStats{memoized: time.Now()}
for _, role := range bitmap {
roletype := models.ROLE_VIEWER
roletype := org.RoleViewer
if role.Bitrole&0b100 != 0 {
roletype = models.ROLE_ADMIN
roletype = org.RoleAdmin
} else if role.Bitrole&0b10 != 0 {
roletype = models.ROLE_EDITOR
roletype = org.RoleEditor
}
memo.total = addToStats(memo.total, roletype, role.Count)
@@ -326,13 +327,13 @@ GROUP BY active, daily_active, role;`
})
}
func addToStats(base models.UserStats, role models.RoleType, count int64) models.UserStats {
func addToStats(base models.UserStats, role org.RoleType, count int64) models.UserStats {
base.Users += count
switch role {
case models.ROLE_ADMIN:
case org.RoleAdmin:
base.Admins += count
case models.ROLE_EDITOR:
case org.RoleEditor:
base.Editors += count
default:
base.Viewers += count