Commit 37f81130 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1851165: filter tags by owner id" into 18.10_STABLE

parents d38113c9 1f5dd73c
......@@ -178,8 +178,8 @@ function get_all_tags_for_user($query = null, $limit = null, $offset = null, $in
END) AS tag, COUNT(*) AS count, i.displayname AS prefix
FROM {tag} t
LEFT JOIN {tag} t2 ON t2.id" . $typecast . " = SUBSTRING(t.tag, 7)
LEFT JOIN {institution} i ON i.name = t2.ownerid AND t2.resourcetype='institution'
WHERE t.editedby=? AND t.resourcetype IN ('artefact', 'view', 'collection', 'blocktype')
LEFT JOIN {institution} i ON i.name = t2.ownerid AND t2.resourcetype = 'institution'
WHERE t.ownertype='user' AND t.ownerid=? AND t.resourcetype IN ('artefact', 'view', 'collection', 'blocktype')
GROUP BY 1, 3
" . $insttagsforuser . "
) tags
......
......@@ -34,4 +34,4 @@ Scenario:
And I should see images within the block "Some HTML"
And I follow "mahara manual"
And I wait "2" seconds
Then I should see "This is the user manual for Mahara"
Then I should see "This is the manual for Mahara"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment