Fixed issues with search

internet2 · Jan 5, 2021 · 69a4800 · 69a4800
1 parent 0506072
commit 69a4800
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -40,6 +40,7 @@ public function groupOwner()
     if (isset($this->request->data['search'])){
       $searchCriteria = urldecode($this->request->data['search']);
       $this->set('groupergroupsowner', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupOwner'));
+      $this->set('searchcriteria', $searchCriteria);
     } else {
       $this->set('groupergroupsowner', $this->GrouperGroup->ownerGroups($this->userId));
     }

diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
@@ -22,7 +22,7 @@ $(function() {
     <div>
         <div class="d-flex">
             <div class="input-group input-group-search">
-                <?php echo $this->Form->input("search", array('class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
+                <?php echo $this->Form->input("search", 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 class="btn btn-outline-secondary px-4" type="submit" value="Submit">

diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css
@@ -204,4 +204,12 @@ a {
 
 .tt-cursor {
     background-color: #EEE;
+}
+
+.input-group > .input.text {
+    position: relative;
+    flex: 1 1 auto;
+    width: 1%;
+    min-width: 0;
+    margin-bottom: 0;
 }