mirror of
https://github.com/documize/community.git
synced 2025-07-25 08:09:43 +02:00
Exclude non-live documents from space level category counts.
This commit is contained in:
parent
b74dfe6385
commit
63ce324eae
1 changed files with 16 additions and 1 deletions
|
@ -219,6 +219,19 @@ func (s Scope) GetSpaceCategorySummary(ctx domain.RequestContext, spaceID string
|
|||
SELECT 'documents' as type, categoryid, COUNT(*) AS count
|
||||
FROM categorymember
|
||||
WHERE orgid=? AND labelid=?
|
||||
AND documentid IN (
|
||||
SELECT refid FROM document
|
||||
WHERE orgid=? AND labelid=?
|
||||
AND lifecycle!=2 AND template=0 AND groupid=''
|
||||
UNION ALL
|
||||
SELECT d.refid
|
||||
FROM (
|
||||
SELECT groupid, MIN(versionorder) AS latestversion
|
||||
FROM document
|
||||
WHERE orgid=? AND labelid=? AND lifecycle!=2 AND groupid!='' AND template=0
|
||||
GROUP BY groupid
|
||||
) AS x INNER JOIN document AS d ON d.groupid=x.groupid AND d.versionorder=x.latestversion
|
||||
)
|
||||
GROUP BY categoryid, type
|
||||
UNION ALL
|
||||
SELECT 'users' as type, refid AS categoryid, count(*) AS count
|
||||
|
@ -226,7 +239,9 @@ func (s Scope) GetSpaceCategorySummary(ctx domain.RequestContext, spaceID string
|
|||
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, spaceID,
|
||||
ctx.OrgID, spaceID, ctx.OrgID, spaceID,
|
||||
ctx.OrgID, ctx.OrgID, spaceID)
|
||||
|
||||
if err == sql.ErrNoRows {
|
||||
err = nil
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue