mirror of
https://github.com/iritmaximus/brewery.git
synced 2026-10-12 19:13:49 +03:00
5.8 beerclub join button is not shown if user already in group
This commit is contained in:
@@ -9,6 +9,7 @@ class BeerclubsController < ApplicationController
|
|||||||
|
|
||||||
# GET /beerclubs/1 or /beerclubs/1.json
|
# GET /beerclubs/1 or /beerclubs/1.json
|
||||||
def show
|
def show
|
||||||
|
@membership = @beerclub.memberships.find_by user_id: current_user
|
||||||
end
|
end
|
||||||
|
|
||||||
# GET /beerclubs/new
|
# GET /beerclubs/new
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class MembershipsController < ApplicationController
|
|||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @membership.save
|
if @membership.save
|
||||||
format.html { redirect_to membership_url(@membership), notice: "Membership was successfully created." }
|
format.html { redirect_to membership_url(@membership), notice: "Successfully joined the beerclub." }
|
||||||
format.json { render :show, status: :created, location: @membership }
|
format.json { render :show, status: :created, location: @membership }
|
||||||
else
|
else
|
||||||
# TODO maybe doing something wrong but the variables of new need to be reinitialized here :D
|
# TODO maybe doing something wrong but the variables of new need to be reinitialized here :D
|
||||||
|
|||||||
@@ -4,11 +4,16 @@
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<% if current_user %>
|
<% if current_user %>
|
||||||
<%= form_with model: Membership.new do |form| %>
|
<% if @membership.nil? %>
|
||||||
<%= form.hidden_field :beerclub_id, value: @beerclub.id %>
|
<%= form_with model: Membership.new do |form| %>
|
||||||
<%= form.hidden_field :user_id, value: current_user.id %>
|
<%= form.hidden_field :beerclub_id, value: @beerclub.id %>
|
||||||
<%= form.submit "Join the beer club" %>
|
<%= form.hidden_field :user_id, value: current_user.id %>
|
||||||
|
<%= form.submit "Join the beer club" %>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<p>You are already in this group</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% else %>
|
<% else %>
|
||||||
<p>Log in to join this beerclub</p>
|
<p>Log in to join this beerclub</p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user