Skip to content

Commit 912a2f1

Browse files
committed
Fix members routes
1 parent 86cc250 commit 912a2f1

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

app/helpers/users_helper.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def users_as_json
1616
balance: membership.account_balance.to_i,
1717

1818
url: organization_user_path(organization_id: membership.organization_id, id: user.id),
19-
edit_link: edit_user_path(user),
19+
edit_link: edit_link(membership),
2020
cancel_link: cancel_member_path(membership),
2121
toggle_manager_link: toggle_manager_member_path(membership),
2222
manager: !!membership.manager,
@@ -29,8 +29,13 @@ def users_as_json
2929

3030
private
3131

32-
def edit_user_path(user)
33-
can_edit_user?(user) ? super : ""
32+
def edit_link(membership)
33+
return '' unless can_edit_user?(membership.user)
34+
35+
edit_organization_user_path(
36+
organization_id: membership.organization_id,
37+
id: membership.user_id
38+
)
3439
end
3540

3641
def can_edit_user?(user)

config/routes.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
get "global/switch_lang", as: :switch_lang
1313

14-
resources :users, only: [:show, :edit]
15-
1614
concern :accountable do
1715
get :give_time, on: :member
1816
end
@@ -21,7 +19,7 @@
2119
# TODO: 'members' path is misleading, there is already a resource called 'members'
2220
resources :users,
2321
concerns: :accountable,
24-
except: [:show, :edit, :destroy],
22+
except: [:destroy],
2523
path: 'members'
2624
resources :inquiries
2725
resources :offers

0 commit comments

Comments
 (0)