diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-17 19:37:53 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-17 19:37:53 +0300 |
| commit | 7c9571a3baa222b52bd44219317f169a82af1d44 (patch) | |
| tree | 1ff27f42788dcc526683c28ecaf9c1eab47e55d8 /app | |
| parent | e71ce77e39837f3e18403ceb07d27a0497b7196c (diff) | |
Address Douwe's feedback
- Make it more explicit that `source` must respond to `#group` and that
`#group` must be present.
- Indent subsequent lines of a multi-line condition.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/members_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/members/_access_request_buttons.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 3897cfa2e10..ec106418f2d 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -8,8 +8,8 @@ module MembersHelper def default_show_roles(member) can?(current_user, action_member_permission(:update, member), member) || - can?(current_user, action_member_permission(:destroy, member), member) || - can?(current_user, action_member_permission(:admin, member), member.source) + can?(current_user, action_member_permission(:destroy, member), member) || + can?(current_user, action_member_permission(:admin, member), member.source) end def remove_member_message(member, user: nil) diff --git a/app/views/shared/members/_access_request_buttons.html.haml b/app/views/shared/members/_access_request_buttons.html.haml index e0fc9f7af37..480e8ba6c85 100644 --- a/app/views/shared/members/_access_request_buttons.html.haml +++ b/app/views/shared/members/_access_request_buttons.html.haml @@ -1,5 +1,5 @@ - member = source.members.find_by(user_id: current_user.id) -- group_member = source.group.members.find_by(user_id: current_user.id) if source.try(:group) +- group_member = source.group.members.find_by(user_id: current_user.id) if source.respond_to?(:group) && source.group - unless group_member - if member |