root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 236 Packages Projects Releases Wiki Activity

alerting: show alerts for user with Viewer role 

changelog: add notes about closing #11167

remove changelog note

reformat alert_test.go
This commit is contained in:
Alexander Zobnin 2018-06-01 13:39:44 +03:00
parent f5cf926364
commit 13c6f37ea5
No known key found for this signature in database
GPG Key ID: E17E9ABACEFA59EB
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/alerting.go
View File

@ -79,7 +79,7 @@ func GetAlerts(c *m.ReqContext) Response {
DashboardIds: dashboardIDs,
Type: string(search.DashHitDB),
FolderIds: folderIDs,
Permission: m.PERMISSION_EDIT,
Permission: m.PERMISSION_VIEW,
}
err := bus.Dispatch(&searchQuery)

2
pkg/services/sqlstore/alert.go
View File

@ -116,7 +116,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
}
if query.User.OrgRole != m.ROLE_ADMIN {
builder.writeDashboardPermissionFilter(query.User, m.PERMISSION_EDIT)
builder.writeDashboardPermissionFilter(query.User, m.PERMISSION_VIEW)
}
builder.Write(" ORDER BY name ASC")

6
pkg/services/sqlstore/alert_test.go
View File

@ -2,7 +2,6 @@ package sqlstore
import (
"testing"
"time"
"github.com/grafana/grafana/pkg/components/simplejson"
@ -110,11 +109,12 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("Viewer cannot read alerts", func() {
alertQuery := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: &m.SignedInUser{OrgRole: m.ROLE_VIEWER}}
viewerUser := &m.SignedInUser{OrgRole: m.ROLE_VIEWER, OrgId: 1}
alertQuery := m.GetAlertsQuery{DashboardIDs: []int64{testDash.Id}, PanelId: 1, OrgId: 1, User: viewerUser}
err2 := HandleAlertsQuery(&alertQuery)
So(err2, ShouldBeNil)
So(alertQuery.Result, ShouldHaveLength, 0)
So(alertQuery.Result, ShouldHaveLength, 1)
})
Convey("Alerts with same dashboard id and panel id should update", func() {