summaryrefslogtreecommitdiff
path: root/app/views/projects/project_members
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-12-05 15:03:16 +0100
committerRémy Coutable <remy@rymai.me>2017-12-12 18:14:58 +0100
commit50d7c356c2d1622203b518bf0f3d5cbf1860099a (patch)
tree4b591c06bb2eea41304985062150c5db4cd5ea67 /app/views/projects/project_members
parent2cf3fc18a6e111a820f9842bb1d939790e8625eb (diff)
downloadgitlab-ce-50d7c356c2d1622203b518bf0f3d5cbf1860099a.tar.gz
Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects/project_members')
-rw-r--r--app/views/projects/project_members/_team.html.haml10
-rw-r--r--app/views/projects/project_members/index.html.haml2
2 files changed, 7 insertions, 5 deletions
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index e71d58ec26d..16bcf671c25 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -1,11 +1,13 @@
+- project = local_assigns.fetch(:project)
+- members = local_assigns.fetch(:members)
+
.panel.panel-default
.panel-heading.flex-project-members-panel
%span.flex-project-title
Members of
- %strong
- #{@project.name}
- %span.badge= @project_members.total_count
- = form_tag project_project_members_path(@project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
+ %strong= project.name
+ %span.badge= members.total_count
+ = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
.form-group
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index fd5d3ec56da..d81103c3a92 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -37,5 +37,5 @@
- if @group_links.any?
= render 'projects/project_members/groups', group_links: @group_links
- = render 'projects/project_members/team', members: @project_members
+ = render 'projects/project_members/team', project: @project, members: @project_members
= paginate @project_members, theme: "gitlab"