Updated subscriber list, pagination

internet2 · Mar 9, 2021 · 47745d1 · 47745d1
1 parent cb23623
commit 47745d1
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 635 deletions.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -111,6 +111,8 @@ public function index() {
   public function groupInfo() {
     $name = urldecode($this->request->query['groupname']);
 
+    $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
+
     $this->set('title', _txt('pl.grouperlite.title.groupinfo'));
 
     try {
@@ -123,6 +125,16 @@ public function groupInfo() {
       $this->set('groupergroupsdetail', array());
       $this->Flash->set(_txt('pl.grouperlite.message.flash.info-group-failed'), array('key' => 'error'));
     }
+
+    try {
+      $groupMembers = $this->membersInGroup();
+      $this->set('groupergroupssubscribers', $groupMembers);
+    } catch (Exception $e) {
+      CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+
+      $this->set('groupergroupssubscribers', array());
+      $this->Flash->set(_txt('pl.grouperlite.message.flash.group-detail-members-failed'), array('key' => 'error'));
+    }
   }
 
   /**
@@ -138,16 +150,20 @@ public function membersInGroup() {
       'groupName' => $groupName
     ];
 
+    $details = [];
+
     try {
       $details = $this->GrouperGroup->membersInGroup($scope);
-      $this->set('membersingroup', $details);
+      // $this->set('membersingroup', $details);
 
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
 
-      $this->set('membersingroup', array());
+      // $this->set('membersingroup', array());
       $this->Flash->set(_txt('pl.grouperlite.message.flash.group-detail-members-failed'), array('key' => 'error'));
     }
+
+    return $details;
   }
 
 

diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
@@ -19,4 +19,9 @@
             </tr>
         <?php endforeach; ?>
     </tbody>
-</table>
+</table>
+<?php if (count($attr) < 1) : ?>
+<div class="alert alert-info">
+    <p class="lead mb-0 text-center">No attributes defined.</p>
+</div>
+<?php endif; ?>
diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
@@ -4,7 +4,7 @@
         <?php foreach ($subscribers as $sub) : ?>
             <tr>
                 <td><?php echo $sub['name']; ?></td>
-                <td><?php echo $sub['email']; ?></td>
+                <td><?php echo $sub['id']; ?></td>
             </tr>
         <?php endforeach; ?>
     </tbody>