Merge branch 'task/vue-conversion' of bitbucket.org:unicon/comanagewo…

…rk into task/vue-conversion
internet2 · Mar 27, 2023 · 436ee5b · 436ee5b
2 parents a5c9c8c + 05a9d1c
commit 436ee5b
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -407,8 +407,13 @@ public function groupOwner()
       'limit' => ($this->passedArgs['limit'] ?? $this->paginate['limit']),
     ];
 
-    if (isset($this->request->data['search'])) {
-      $searchCriteria = urldecode($this->request->data['search']);
+    if (isset($this->request->data['search']) || isset($this->request->query['search'])) {
+      if(isset($this->request->data['search'])){
+        $searchCriteria = urldecode($this->request->data['search']);
+      } else {
+        $searchCriteria = urldecode($this->request->query['search']);
+      }
+
       $this->set('searchcriteria', $searchCriteria);
 
       try {
@@ -477,8 +482,13 @@ public function groupMember()
       'limit' => ($this->passedArgs['limit'] ?? $this->paginate['limit']),
     ];
 
-    if (isset($this->request->data['search'])) {
-      $searchCriteria = urldecode($this->request->data['search']);
+    if (isset($this->request->data['search']) || isset($this->request->query['search'])) {
+      if(isset($this->request->data['search'])){
+        $searchCriteria = urldecode($this->request->data['search']);
+      } else {
+        $searchCriteria = urldecode($this->request->query['search']);
+      }
+
       $this->set('searchcriteria', $searchCriteria);
 
       try {
@@ -552,8 +562,13 @@ public function groupOptin()
       'limit' => ($this->passedArgs['limit'] ?? $this->paginate['limit']),
     ];
 
-    if (isset($this->request->data['search'])) {
-      $searchCriteria = urldecode($this->request->data['search']);
+    if (isset($this->request->data['search']) || isset($this->request->query['search'])) {
+      if(isset($this->request->data['search'])){
+        $searchCriteria = urldecode($this->request->data['search']);
+      } else {
+        $searchCriteria = urldecode($this->request->query['search']);
+      }
+
       $this->set('searchcriteria', $searchCriteria);
 
       try {
@@ -768,16 +783,16 @@ function isAuthorized()
 
     //TODO - This is needed for my dev enviro since I do not log in via I2 IdP
     // BEGIN ===============================================
-    if ($this->Session->check('Auth.User.username')) {
-      $this->userId = $this->Session->read('Auth.User.username');
-    }
+//    if ($this->Session->check('Auth.User.username')) {
+//      $this->userId = $this->Session->read('Auth.User.username');
+//    }
     // END ===============================================
 
     //TODO - Need to make the following code configurable in getting the user ID. In this case the code is
     // specific to the needs of I2.
     // BEGIN ===============================================
 
-    /*$uid=$this->Session->read('Auth.User.co_person_id');
+    $uid=$this->Session->read('Auth.User.co_person_id');
     $username=$this->Session->read('Auth.User.username');
     error_log("HUBING ================ " . $username);
 
@@ -817,7 +832,7 @@ function isAuthorized()
       $this->Session->write('Plugin.Grouper.UserId', $this->userId);
     }
     // END ===============================================
-    */
+
 
     // Determine what operations this user can perform
     // Construct the permission set for this user, which will also be passed to the view.