Merge pull request #24 from Ioannis/Fix_popover_content

Fix popover content
internet2 · May 1, 2024 · 828336b · 828336b
2 parents d9cc895 + add2a83
commit 828336b
Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/webroot/js/groups-table.js b/webroot/js/groups-table.js
@@ -12,7 +12,6 @@ export default {
         }
     },
     inject: ['txt', 'api', 'other'],
-    created() {},
     template: /*html*/`
         <table class="table w-100 mb-0" v-if="groups.length > 0">
             <thead>
@@ -23,7 +22,7 @@ export default {
             <tbody v-if="!nested">
                 <tr v-for="group in groups" class="collapse-adhoc-group-parent">
                     <td class="pl-3" v-if="columns.indexOf('name') > -1">
-                        <span v-popover="group.name" class="grpr-popover-toggle">
+                        <span v-popover data-toggle="popover" :data-content="group.name">
                             {{ group.displayExtension || 'No Name' }}
                         </span>
                     </td>
@@ -120,7 +119,7 @@ export default {
                         <template v-for="(group, key) in wggroup.Groups" v-if="show">
                             <tr :class="['collapse-wg-' + wggroup.WGName]" class="collapse-wg-working-group" :id="'collapse-wg-' + wggroup.WGName + '-' + key">
                                 <td class="pl-3">
-                                    <span class="grpr-popover-toggle" v-popover="group.name">
+                                    <span v-popover data-toggle="popover" :data-content="group.name">
                                         {{ group.WGApp || "No Name" }}
                                     </span>
                                 </td>

diff --git a/webroot/js/nested-table.js b/webroot/js/nested-table.js
@@ -56,7 +56,7 @@ export default {
                         <template v-for="(group, key) in wggroup.Groups" v-if="show">
                             <tr :class="['collapse-wg-' + wggroup.WGName]" class="collapse-wg-working-group" :id="'collapse-wg-' + wggroup.WGName + '-' + key">
                                 <td class="pl-3">
-                                    <span class="grpr-popover-toggle" v-popover="group.name">
+                                    <span v-popover data-toggle="popover" :data-content="group.name">
                                         {{ group.WGApp || "No Name" }}
                                     </span>
                                 </td>

diff --git a/webroot/js/popover.js b/webroot/js/popover.js
@@ -1,7 +1,6 @@
 export default {
-    mounted(el, { value }) {
+    mounted(el) {
       jQuery(el).popover({
-        content: value,
         trigger: 'hover',
         placement: 'top',
         container: 'body'