diff --git a/domain/category/mysql/store.go b/domain/category/mysql/store.go index 32ca0f23..fdf3cc9e 100644 --- a/domain/category/mysql/store.go +++ b/domain/category/mysql/store.go @@ -194,16 +194,17 @@ func (s Scope) GetSpaceCategorySummary(ctx domain.RequestContext, spaceID string c = []category.SummaryModel{} err = s.Runtime.Db.Select(&c, ` - SELECT 'documents' as type, categoryid, COUNT(*) as count + SELECT 'documents' as type, categoryid, COUNT(*) AS count FROM categorymember - WHERE orgid=? AND labelid=? GROUP BY categoryid, type + WHERE orgid=? AND labelid=? + GROUP BY categoryid, type UNION ALL SELECT 'users' as type, refid AS categoryid, count(*) AS count FROM permission WHERE orgid=? AND location='category' AND refid IN (SELECT refid FROM category WHERE orgid=? AND labelid=?) GROUP BY refid, type`, - ctx.OrgID, spaceID, ctx.OrgID, ctx.OrgID, spaceID /*, ctx.OrgID, ctx.OrgID, spaceID*/) + ctx.OrgID, spaceID, ctx.OrgID, ctx.OrgID, spaceID) if err == sql.ErrNoRows { err = nil diff --git a/gui/app/services/event-bus.js b/gui/app/services/event-bus.js index e8f185e9..feac591e 100644 --- a/gui/app/services/event-bus.js +++ b/gui/app/services/event-bus.js @@ -10,7 +10,6 @@ // https://documize.com import Evented from '@ember/object/evented'; - import Service from '@ember/service'; export default Service.extend(Evented, {