File tree 2 files changed +9
-6
lines changed 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ def users_as_json
16
16
balance : membership . account_balance . to_i ,
17
17
18
18
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 ) ,
20
20
cancel_link : cancel_member_path ( membership ) ,
21
21
toggle_manager_link : toggle_manager_member_path ( membership ) ,
22
22
manager : !!membership . manager ,
@@ -29,8 +29,13 @@ def users_as_json
29
29
30
30
private
31
31
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
+ )
34
39
end
35
40
36
41
def can_edit_user? ( user )
Original file line number Diff line number Diff line change 11
11
12
12
get "global/switch_lang" , as : :switch_lang
13
13
14
- resources :users , only : [ :show , :edit ]
15
-
16
14
concern :accountable do
17
15
get :give_time , on : :member
18
16
end
21
19
# TODO: 'members' path is misleading, there is already a resource called 'members'
22
20
resources :users ,
23
21
concerns : :accountable ,
24
- except : [ :show , :edit , : destroy] ,
22
+ except : [ :destroy ] ,
25
23
path : 'members'
26
24
resources :inquiries
27
25
resources :offers
You can’t perform that action at this time.
0 commit comments