diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-27 16:20:57 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-01 17:44:46 +0200 |
| commit | bd78f5733ca546bf940438b84aefa2fa3abacb36 (patch) | |
| tree | 9d9ac648a594623489e628e025bde48f7ef2b2f9 /app/views/shared | |
| parent | 557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff) | |
| download | gitlab-ce-explicit-requesters-scope.tar.gz | |
Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope
And create new Project#requesters, Group#requesters scopes.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/members/_access_request_buttons.html.haml | 16 | ||||
| -rw-r--r-- | app/views/shared/members/_requests.html.haml | 6 |
2 files changed, 9 insertions, 13 deletions
diff --git a/app/views/shared/members/_access_request_buttons.html.haml b/app/views/shared/members/_access_request_buttons.html.haml index c56418f052a..35dcdccc921 100644 --- a/app/views/shared/members/_access_request_buttons.html.haml +++ b/app/views/shared/members/_access_request_buttons.html.haml @@ -1,13 +1,9 @@ -- member = source.members.find_by(user_id: current_user.id) -- group_member = source.group.members.find_by(user_id: current_user.id) if source.respond_to?(:group) && source.group - -- unless group_member - - if member - - if member.request? - = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]), - method: :delete, - data: { confirm: remove_member_message(member) }, - class: 'btn' +- if can_see_request_access_button?(source) + - if requester = source.requesters.find_by(user_id: current_user.id) + = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]), + method: :delete, + data: { confirm: remove_member_message(requester) }, + class: 'btn' - else = link_to 'Request Access', polymorphic_path([:request_access, source, :members]), method: :post, diff --git a/app/views/shared/members/_requests.html.haml b/app/views/shared/members/_requests.html.haml index e4bd2bdc265..40b39e850b0 100644 --- a/app/views/shared/members/_requests.html.haml +++ b/app/views/shared/members/_requests.html.haml @@ -1,8 +1,8 @@ -- if members.any? +- if requesters.any? .panel.panel-default .panel-heading %strong= membership_source.name access requests - %span.badge= members.size + %span.badge= requesters.size %ul.content-list - = render partial: 'shared/members/member', collection: members, as: :member + = render partial: 'shared/members/member', collection: requesters, as: :member |