Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders

2017-06-19 18:55:34 -04:00
parent 93bc588dae 812112f2f6
commit 212a66ae5f
3 changed files with 8 additions and 3 deletions
@@ -20,6 +20,10 @@ func SetDashboardAcl(cmd *m.SetDashboardAclCommand) error {
 			return m.ErrDashboardAclInfoMissing
 		}

+		if cmd.DashboardId == 0 {
+			return m.ErrDashboardPermissionDashboardEmpty
+		}
+
 		if res, err := sess.Query("SELECT 1 from "+dialect.Quote("dashboard_acl")+" WHERE dashboard_id =? and (user_group_id=? or user_id=?)", cmd.DashboardId, cmd.UserGroupId, cmd.UserId); err != nil {
 			return err
 		} else if len(res) == 1 {