Merge branch 'develop' into October2022

internet2 · Oct 13, 2022 · 220cef8 · 220cef8
2 parents b4c1c6c + 95145f3
commit 220cef8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
@@ -2,7 +2,10 @@
     <div class="modal-dialog modal-dialog-scrollable modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h3 class="modal-title h5" id="modal-title"><?php echo _txt('pl.grouperlite.group.info.members-heading'); ?></h3>
+                <h3 class="modal-title h5" id="modal-title">
+                    <?php echo _txt('pl.grouperlite.group.info.members-heading'); ?>:
+                    <span id="model-title-group-name"></span>
+                </h3>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                     <span class="sr-only">Close</span>
@@ -84,14 +87,15 @@
         $('.members-btn').click(function(ev) {
             var $this = $(this);
             group = $this.data('id');
+            name = $this.data('name');
             modal = $('#subscribers');
             modal.modal('toggle').on('hide.bs.modal', function() {
                 modal.find('#add-user-form').off('submit', onAddUserSubmit);
             });
 
             modal.find('#add-user-form').on('submit', onAddUserSubmit);
 
-            load = loadModalData(group);
+            load = loadModalData(group, name);
             load();
 
             attachAutoComplete();
@@ -159,7 +163,8 @@
             onRemoveUser(user, group, button, data);
         }
 
-        function loadModalData(id) {
+        function loadModalData(id, name) {
+            $('#model-title-group-name').text(name);
             return function() {
                 modal.addClass('loading');
                 clean();

diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
@@ -65,7 +65,9 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                                     'group' => $group['name'],
                                     'idx' => $key
                                 )) : ''; ?>
-                                <button class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap members-btn" data-id="<?php echo urlencode($group['name']); ?>"><?php echo _txt('pl.grouperlite.action.members'); ?> <em class="material-icons mt-0" aria-hidden="true">group</em>
+                                <button class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap members-btn"
+                                    data-id="<?php echo urlencode($group['name']); ?>"
+                                    data-name="<?php echo ($group['friendlyName']); ?>"><?php echo _txt('pl.grouperlite.action.members'); ?> <em class="material-icons mt-0" aria-hidden="true">group</em>
                                 </button>
                             </span>
                         </td>

diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
@@ -73,7 +73,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
                   'group' => $group['name'],
                   'idx' => $key
                 )) : ''; ?>
-                <button class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap members-btn" data-id="<?php echo urlencode($group['name']) ?>">
+                <button class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap members-btn" data-id="<?php echo urlencode($group['name']) ?>" data-name="<?php echo ($group['friendlyName']); ?>">
                   <?php echo _txt('pl.grouperlite.action.members'); ?> <em class="material-icons mt-0" aria-hidden="true">group</em>
                 </button>
                 <?php if ($isuserowner === 'T' && $isGrouperVisible === 'T') : ?>