Included groups on project_members page

4 files changed, 19 insertions, 18 deletions

diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml
index e783d8c72c5..9738f369a35 100644
--- a/app/views/projects/project_members/_group_members.html.haml
+++ b/app/views/projects/project_members/_group_members.html.haml
@@ -1,7 +1,7 @@
 .panel.panel-default
   .panel-heading
+    Group members with access to
     %strong #{@group.name}
-    group members
     %span.badge= members.size
     - if can?(current_user, :admin_group_member, @group)
       .controls
diff --git a/app/views/projects/project_members/_groups.html.haml b/app/views/projects/project_members/_groups.html.haml
new file mode 100644
index 00000000000..79791af7963
--- /dev/null
+++ b/app/views/projects/project_members/_groups.html.haml
@@ -0,0 +1,9 @@
+.panel.panel-default
+  .panel-heading
+    Groups with access to
+    %strong #{@project.name}
+    %span.badge= groups.size
+  %ul.content-list
+    - @groups.each do |group_link|
+      - group = group_link.group
+      = render 'shared/members/group', group_link: group_link, group: group
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index db6c1194da7..6a8b28d3886 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -3,17 +3,5 @@
     Users with access to
     %strong #{@project.name}
     %span.badge= members.size
-    .controls
-      = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
-        .form-group
-          = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control', spellcheck: false }
-        = button_tag class: 'btn', title: 'Search' do
-          = icon("search")
   %ul.content-list
     = render partial: 'shared/members/member', collection: members, as: :member
-
-:javascript
-  $('form.member-search-form').on('submit', function (event) {
-    event.preventDefault();
-    Turbolinks.visit(this.action + '?' + $(this).serialize());
-  });
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index 9d47e7d725c..db8a060d170 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -14,12 +14,16 @@
 
       = render 'shared/members/requests', membership_source: @project, requesters: @requesters
 
-  %h5.append-bottom-default
-    Existing users and groups
+  .append-bottom-default.clearfix
+    %h5.pull-left
+      Existing users and groups
+    = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form pull-right hidden-xs hidden-sm'  do
+      .form-group
+        = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
+        = icon("search")
+  - if @grups
+    = render 'groups', groups: @groups
   = render 'team', members: @project_members
 
   - if @group
     = render "group_members", members: @group_members
-
-  - if @project_group_links.any? && @project.allowed_to_share_with_group?
-    = render "shared_group_members"