From 55374bb141ada730900b95a4c1ba02adf2574c69 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 3 Nov 2022 14:16:18 -0700
Subject: [PATCH] Removed subscriber actions from my memberships page

---
 View/Elements/Components/subscriberList.ctp | 46 +++++++++++----------
 View/GrouperGroups/groupmember.ctp          |  2 +-
 View/GrouperGroups/groupowner.ctp           |  2 +-
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
index 4930d29..e06de8c 100644
--- a/View/Elements/Components/subscriberList.ctp
+++ b/View/Elements/Components/subscriberList.ctp
@@ -24,33 +24,35 @@
                 <p>You do not have access to view memberships.</p>
             </div>
             <div class="modal-body subs">
+                <?php if ($addSubscribers) : ?>
+                    <div class="d-flex mb-4">
+                        <?php echo $this->Form->create(false, array(
+                            'url' => array('controller' => 'grouper_groups', 'action' => 'groupSubscribers'),
+                            'class' => 'add-user-form w-100',
+                            'id' => 'add-user-form',
+                        )); ?>
+                        <label class="sr-only" for="addUser"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
+                        <div class="input-group">
+                            <?php echo $this->Form->input("addUser", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
+                            <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
+
+                            <div class="input-group-append">
+                                <button id="addUserbutton" class=" btn btn-grouper btn-primary px-4" type="submit" value="Submit">
+                                    <em class="material-icons lg" aria-hidden="true">add</em>
+                                    <span class="ml-2"><?php echo _txt('pl.grouperlite.action.add-user'); ?></span>
+                                </button>
+                            </div>
 
-                <div class="d-flex mb-4">
-                    <?php echo $this->Form->create(false, array(
-                        'url' => array('controller' => 'grouper_groups', 'action' => 'groupSubscribers'),
-                        'class' => 'add-user-form w-100',
-                        'id' => 'add-user-form',
-                    )); ?>
-                    <label class="sr-only" for="addUser"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
-                    <div class="input-group">
-                        <?php echo $this->Form->input("addUser", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
-                        <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
-                        <div class="input-group-append">
-                            <button id="addUserbutton" class=" btn btn-grouper btn-primary px-4" type="submit" value="Submit">
-                                <em class="material-icons lg" aria-hidden="true">add</em>
-                                <span class="ml-2"><?php echo _txt('pl.grouperlite.action.add-user'); ?></span>
-                            </button>
                         </div>
+                        <?php echo $this->Form->end(); ?>
+                    </div>
+                    <div>
+                        <p class="alert alert-danger error"></p>
                     </div>
-                    <?php echo $this->Form->end(); ?>
-                </div>
-                <div>
-                    <p class="alert alert-danger error"></p>
-                </div>
+                <?php endif; ?>
                 <table class="table table-striped">
                     <tbody id="sub-body"></tbody>
                 </table>
-
             </div>
             <div class="modal-footer d-flex justify-content-end">
                 <button type="button" class="btn btn-grouper btn-link" data-dismiss="modal"><?php echo _txt('pl.grouperlite.action.close'); ?></button>
@@ -208,9 +210,11 @@
                             "class" => "remove-user-form",
                             "id" => "remove-user-form"
                         )); ?>',
+                    <?php if ($addSubscribers) : ?>
                     '<button data-user="' + item.id + '" class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap member-del-btn">',
                     '<?php echo _txt('pl.grouperlite.action.remove-user'); ?>',
                     '</button>',
+                    <?php endif; ?>
                     '<?php echo $this->Form->end(); ?>',
                     '</td>',
                     '</tr>'
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index d17a7ed..ca78267 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -143,5 +143,5 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
     </div>
 <?php endif; ?>
 
-<?php echo $this->element('Components/subscriberList'); ?>
+<?php echo $this->element('Components/subscriberList', array('addSubscribers' => false)); ?>
 <!--/nocache-->
\ No newline at end of file
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 7cfaa10..e2cb35a 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -115,5 +115,5 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false;
     <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'); ?>
+<?php echo $this->element('Components/subscriberList', array('addSubscribers' => true)); ?>
 <!--/nocache-->
\ No newline at end of file