diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-06 15:41:00 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-06 15:41:00 +0100 |
commit | 6865c46c6649118e09e60dd29dfa060470010aa9 (patch) | |
tree | b5ab32dd1311bc46b678fb442b91f347f3348630 /app/views/projects/project_members | |
parent | 996e802415aa1edadb96b1f7efa924581fb047ed (diff) | |
download | gitlab-ce-6865c46c6649118e09e60dd29dfa060470010aa9.tar.gz |
Changed how collections are rendered
Used variables in haml for replicated checks
Fixed broken conflict
Diffstat (limited to 'app/views/projects/project_members')
-rw-r--r-- | app/views/projects/project_members/_groups.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/project_members/_team.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/project_members/index.html.haml | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/views/projects/project_members/_groups.html.haml b/app/views/projects/project_members/_groups.html.haml index 11f896006da..d7f5fa96527 100644 --- a/app/views/projects/project_members/_groups.html.haml +++ b/app/views/projects/project_members/_groups.html.haml @@ -4,6 +4,4 @@ %strong #{@project.name} %span.badge= group_links.size %ul.content-list - - group_links.each do |group_link| - - group = group_link.group - = render 'shared/members/group', group_link: group_link, group: group + = render partial: 'shared/members/group', collection: group_links, as: :group_link diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml index ff54035cfe1..c1e894d8f40 100644 --- a/app/views/projects/project_members/_team.html.haml +++ b/app/views/projects/project_members/_team.html.haml @@ -4,5 +4,4 @@ %strong #{@project.name} %span.badge= @project_members.total_count %ul.content-list - - members.each do |member| - = render 'shared/members/member', member: member + = render partial: 'shared/members/member', collection: members, as: :member diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index f1461444241..bdeb704b6da 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -21,7 +21,7 @@ = 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" } = icon("search") - - if @group_links.size > 0 + - if @group_links.any? = render 'groups', group_links: @group_links = render 'team', members: @project_members |