Merge branch 'ajax-group-select' into 'master'

Ajax group select

Helper method for creatins select2 selectbox with ajax query to groups via API

See merge request !1363

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index f0ab6938b1c..a2d915a7eca 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -25,11 +25,14 @@ module API
       # Example Request:
       #  GET /groups
       get do
-        if current_user.admin
-          @groups = paginate Group
-        else
-          @groups = paginate current_user.groups
-        end
+        @groups = if current_user.admin
+                    Group.all
+                  else
+                    current_user.groups
+                  end
+
+        @groups = @groups.search(params[:search]) if params[:search].present?
+        @groups = paginate @groups
         present @groups, with: Entities::Group
       end