From 763d84a6422fa69d76969e8af46ab796bd42480d Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 27 Sep 2021 10:24:17 -0700
Subject: [PATCH] resolved conflict

---
 View/Elements/Components/subscriberList.ctp | 25 ++++++++++++---------
 View/GrouperGroups/groupmember.ctp          |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
index e1fa91b..fcbec65 100644
--- a/View/Elements/Components/subscriberList.ctp
+++ b/View/Elements/Components/subscriberList.ctp
@@ -17,15 +17,7 @@
             </div>
             <div class="modal-body subs">
                 <table class="table table-striped">
-                    <tbody>
-                    <?php var_dump($subscribers) ?>
-                        <?php foreach ($subscribers as $sub) : ?>
-                            <tr>
-                                <td><?php echo $sub['name']; ?></td>
-                                <td><?php echo $sub['id']; ?></td>
-                            </tr>
-                        <?php endforeach; ?>
-                    </tbody>
+                    <tbody id="sub-body"></tbody>
                 </table>
             </div>
             <div class="modal-footer">
@@ -53,8 +45,21 @@
             url: url + '?groupname=' + id,
             dataType: 'json',
             success: function(data) {
-                console.log(data);
+                $('#sub-body').html(data.reduce(function (table, item) {
+                    var row = [
+                        '<tr>',
+                        '<td>',
+                        item.name,
+                        '</td>',
+                        '<td>',
+                        item.id,
+                        '</td>',
+                        '</tr>'
+                    ].join('');
 
+                    table += row;
+                    return table;
+                }, ''))
             },
             error: function() {
                 modal.addClass('error');
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 0eed63b..eb5d5d2 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -169,4 +169,4 @@ $numColumns = count($columns);
         <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
     </div>
 <?php endif; ?>
-<?php echo $this->element('Components/subscriberList', array('subscribers' => $subscribers)); ?>
\ No newline at end of file
+<?php echo $this->element('Components/subscriberList'); ?>
\ No newline at end of file