diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-27 17:20:57 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-01 18:44:46 +0300 |
| commit | bd78f5733ca546bf940438b84aefa2fa3abacb36 (patch) | |
| tree | 9d9ac648a594623489e628e025bde48f7ef2b2f9 /app/views/projects/project_members | |
| parent | 557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff) | |
Exclude requesters from Project#members, Group#members and User#members
And create new Project#requesters, Group#requesters scopes.
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/_shared_group_members.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/project_members/_shared_group_members.html.haml b/app/views/projects/project_members/_shared_group_members.html.haml index 840b57c2e63..77370c14def 100644 --- a/app/views/projects/project_members/_shared_group_members.html.haml +++ b/app/views/projects/project_members/_shared_group_members.html.haml @@ -1,6 +1,6 @@ - @project_group_links.each do |group_links| - shared_group = group_links.group - - shared_group_members = shared_group.members.non_request + - shared_group_members = shared_group.members - shared_group_users_count = shared_group_members.size .panel.panel-default .panel-heading diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index a2026c41d01..9031f01b496 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -13,12 +13,12 @@ Users with access to this project are listed below. = render "new_project_member" - = render 'shared/members/requests', membership_source: @project, members: @project_members.request + = render 'shared/members/requests', membership_source: @project, requesters: @requesters - = render 'team', members: @project_members.non_request + = render 'team', members: @project_members - if @group - = render "group_members", members: @group_members.non_request + = render "group_members", members: @group_members - if @project_group_links.any? && @project.allowed_to_share_with_group? = render "shared_group_members" |