diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb index b04f983..f570a38 100644 --- a/app/controllers/memberships_controller.rb +++ b/app/controllers/memberships_controller.rb @@ -54,10 +54,11 @@ class MembershipsController < ApplicationController # DELETE /memberships/1 or /memberships/1.json def destroy + @user = @membership.user @membership.destroy respond_to do |format| - format.html { redirect_to memberships_url, notice: "Membership was successfully destroyed." } + format.html { redirect_to user_path(@user), notice: "Successfully exited the group." } format.json { head :no_content } end end diff --git a/app/views/beerclubs/show.html.erb b/app/views/beerclubs/show.html.erb index dfc3cc6..0ee1343 100644 --- a/app/views/beerclubs/show.html.erb +++ b/app/views/beerclubs/show.html.erb @@ -11,7 +11,11 @@ <%= form.submit "Join the beer club" %> <% end %> <% else %> -

You are already in this group

+ <%= form_with(model: @membership, method: :delete) do |form| %> + <%= form.hidden_field :beer_club_id, value: @beerclub.id %> + <%= form.hidden_field :user_id, value: current_user.id %> + <%= form.submit "End the membership" %> + <% end %> <% end %> <% else %>