diff options
author | TM Lee <tm89lee@gmail.com> | 2017-03-02 14:01:02 +0800 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-12-11 18:30:56 +0100 |
commit | 2cf3fc18a6e111a820f9842bb1d939790e8625eb (patch) | |
tree | 5ebad1908460ef6bbdbab371373bd0705372218e /app/services/members | |
parent | bd8b6518855bd9768ca5d245467b5ff0934e40b6 (diff) | |
download | gitlab-ce-2cf3fc18a6e111a820f9842bb1d939790e8625eb.tar.gz |
Refactor member view by using presenter
- Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter
- Make Member model Presentable
- Move action_member_permission from MembersHelper into the MemberPresenter
- Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter
Fixes #28004.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/members')
-rw-r--r-- | app/services/members/approve_access_request_service.rb | 11 | ||||
-rw-r--r-- | app/services/members/destroy_service.rb | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/app/services/members/approve_access_request_service.rb b/app/services/members/approve_access_request_service.rb index c13f289f61e..2a2bb0cae5b 100644 --- a/app/services/members/approve_access_request_service.rb +++ b/app/services/members/approve_access_request_service.rb @@ -35,8 +35,17 @@ module Members def can_update_access_requester?(access_requester, opts = {}) access_requester && ( opts[:force] || - can?(current_user, action_member_permission(:update, access_requester), access_requester) + can?(current_user, update_member_permission(access_requester), access_requester) ) end + + def update_member_permission(member) + case member + when GroupMember + :update_group_member + when ProjectMember + :update_project_member + end + end end end diff --git a/app/services/members/destroy_service.rb b/app/services/members/destroy_service.rb index 46c505baf8b..05b93ac8fdb 100644 --- a/app/services/members/destroy_service.rb +++ b/app/services/members/destroy_service.rb @@ -36,7 +36,16 @@ module Members end def can_destroy_member?(member) - member && can?(current_user, action_member_permission(:destroy, member), member) + member && can?(current_user, destroy_member_permission(member), member) + end + + def destroy_member_permission(member) + case member + when GroupMember + :destroy_group_member + when ProjectMember + :destroy_project_member + end end end end |