Merge conflicts

apostrophecms · Nov 6, 2024 · a0f422e · a0f422e
2 parents c60ecb2 + 6b7c1dc
commit a0f422e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 * Extra bundle detection when using external build module works properly now.
 * Widget players are now properly invoked when they arrive later in the page load process.
+* Fix permission grid tooltip display.
 
 ### Adds
 

diff --git a/modules/@apostrophecms/permission/ui/apos/components/AposPermissionGrid.vue b/modules/@apostrophecms/permission/ui/apos/components/AposPermissionGrid.vue
@@ -113,7 +113,7 @@ export default {
       html.appendChild(list);
 
       return {
-        content: html,
+        content: html.innerHTML,
         localize: false
       };
     },