diff options
Diffstat (limited to 'app/controllers/concerns/membership_actions.rb')
-rw-r--r-- | app/controllers/concerns/membership_actions.rb | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb index 8c7f156f7f8..816a93f14c6 100644 --- a/app/controllers/concerns/membership_actions.rb +++ b/app/controllers/concerns/membership_actions.rb @@ -22,10 +22,14 @@ module MembershipActions .new(current_user, update_params) .execute(member) - member = present_members([member]).first - - respond_to do |format| - format.js { render 'shared/members/update', locals: { member: member } } + if member.expires? + render json: { + expires_in: helpers.distance_of_time_in_words_to_now(member.expires_at), + expires_soon: member.expires_soon?, + expires_at_formatted: member.expires_at.to_time.in_time_zone.to_s(:medium) + } + else + render json: {} end end @@ -101,7 +105,7 @@ module MembershipActions # rubocop: enable CodeReuse/ActiveRecord def resend_invite - member = membershipable.members.find(params[:id]) + member = membershipable_members.find(params[:id]) if member.invite? member.resend_invite @@ -118,6 +122,10 @@ module MembershipActions raise NotImplementedError end + def membershipable_members + raise NotImplementedError + end + def root_params_key case membershipable when Namespace |