Various fixes to data access

2015-01-20 15:23:14 +01:00
parent 0a695ba17a
commit 4ea5d80099
8 changed files with 27 additions and 8 deletions
@@ -120,7 +120,16 @@ func SearchDashboards(query *m.SearchDashboardsQuery) error {
 }

 func GetDashboardTags(query *m.GetDashboardTagsQuery) error {
-	sess := x.Sql("select count(*) as count, term from dashboard_tag group by term")
+	sql := `SELECT
+					  COUNT(*) as count,
+						term
+					FROM dashboard
+					INNER JOIN dashboard_tag on dashboard_tag.dashboard_id = dashboard.id
+					WHERE dashboard.account_id=?
+					GROUP BY term`
+
+	query.Result = make([]*m.DashboardTagCloudItem, 0)
+	sess := x.Sql(sql, query.AccountId)
 	err := sess.Find(&query.Result)
 	return err
 }