mirror of
https://github.com/iritmaximus/brewery.git
synced 2026-10-12 19:13:49 +03:00
upto 2.9
This commit is contained in:
@@ -13,6 +13,7 @@ class BeersController < ApplicationController
|
|||||||
# GET /beers/new
|
# GET /beers/new
|
||||||
def new
|
def new
|
||||||
@beer = Beer.new
|
@beer = Beer.new
|
||||||
|
@breweries = Brewery.all
|
||||||
end
|
end
|
||||||
|
|
||||||
# GET /beers/1/edit
|
# GET /beers/1/edit
|
||||||
@@ -25,7 +26,7 @@ class BeersController < ApplicationController
|
|||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @beer.save
|
if @beer.save
|
||||||
format.html { redirect_to beer_url(@beer), notice: "Beer was successfully created." }
|
format.html { redirect_to beers_path, notice: "Beer was successfully created." }
|
||||||
format.json { render :show, status: :created, location: @beer }
|
format.json { render :show, status: :created, location: @beer }
|
||||||
else
|
else
|
||||||
format.html { render :new, status: :unprocessable_entity }
|
format.html { render :new, status: :unprocessable_entity }
|
||||||
|
|||||||
@@ -9,4 +9,8 @@ class Beer < ApplicationRecord
|
|||||||
end
|
end
|
||||||
return average
|
return average
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def to_s
|
||||||
|
"#{self.name}, #{(Brewery.find_by_id self.brewery_id).name}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<%= form.label :brewery_id, style: "display: block" %>
|
<%= form.label :brewery_id, style: "display: block" %>
|
||||||
<%= form.number_field :brewery_id %>
|
<%= form.select :brewery_id, options_from_collection_for_select(@breweries, :id, :name) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<h2>Create new rating</h2>
|
<h2>Create new rating</h2>
|
||||||
|
|
||||||
<%= form_for(@rating) do |f| %>
|
<%= form_for(@rating) do |f| %>
|
||||||
<%= f.select :beer_id, options_from_collection_for_select(@beers, :id, :name) %>
|
<%= f.select :beer_id, options_from_collection_for_select(@beers, :id, :to_s) %>
|
||||||
score: <%= f.number_field :score %>
|
score: <%= f.number_field :score %>
|
||||||
<%= f.submit %>
|
<%= f.submit %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user