Fix search by input

2 files changed, 9 insertions, 5 deletions

diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 50bdc27a7a6..6fcc016110f 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -16,12 +16,10 @@ export default {
   },
   methods: {
     onClickRowGroup(e) {
-      // e.stopPropagation();
+      e.stopPropagation();
 
       // Skip for buttons
-      if (e.target.tagName === 'A' ||
-        (e.target.tagName === 'I' && e.target.parentElement.tagName === 'A')) {
-      } else {
+      if (!(e.target.tagName === 'A') && !(e.target.tagName === 'I' && e.target.parentElement.tagName === 'A')) {
         if (this.group.hasSubgroups) {
           eventHub.$emit('toggleSubGroups', this.group);
         } else {
diff --git a/app/assets/javascripts/groups/groups_filterable_list.js b/app/assets/javascripts/groups/groups_filterable_list.js
index ab674dd4f5b..9a8797caf36 100644
--- a/app/assets/javascripts/groups/groups_filterable_list.js
+++ b/app/assets/javascripts/groups/groups_filterable_list.js
@@ -33,7 +33,13 @@ export default class GroupFilterableList extends FilterableList {
     this.filterResults(this.filterUrl);
   }
 
-  onFilterSuccess(data, textStatus, xhr) {
+  preOnFilterSuccess(comingFrom) {
+    if (comingFrom === 'filter-input') {
+      this.filterUrl = `${this.filterForm.getAttribute('action')}?${$(this.filterForm).serialize()}`;
+    }
+  }
+
+  onFilterSuccess(data, xhr) {
     super.onFilterSuccess(data);
 
     this.store.setGroups(data);