Merge branch 'develop' into panel-title-menu-ux

2017-08-02 09:56:08 +02:00
parent e312408855 ebcbcdc27a
commit 9fb60c2fc8
116 changed files with 5196 additions and 1071 deletions
@@ -33,14 +33,15 @@ func initContextWithRenderAuth(ctx *Context) bool {

 type renderContextFunc func(key string) (string, error)

-func AddRenderAuthKey(orgId int64) string {
+func AddRenderAuthKey(orgId int64, userId int64, orgRole m.RoleType) string {
 	renderKeysLock.Lock()

 	key := util.GetRandomString(32)

 	renderKeys[key] = &m.SignedInUser{
 		OrgId:   orgId,
-		OrgRole: m.ROLE_VIEWER,
+		OrgRole: orgRole,
+		UserId:  userId,
 	}

 	renderKeysLock.Unlock()