Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/controllers/bookings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ def show
end

def new
@tool = Tool.find(params[:tool_id])
@booking = Booking.new
authorize @booking
end

def create
@booking = Booking.create(booking_params)
authorize @booking
@user = User.find(params[:id])
@booking = Booking.new #(booking_params)
# Linking the models
@booking.user = @user
@booking.tool = Tool.find(params[:tool_id])
@booking.user = current_user
authorize @booking
if @booking.save
redirect_to booking_path(@booking)
else
Expand Down Expand Up @@ -50,9 +51,10 @@ def destroy

private

def booking_params
params.require(:booking).permit(:tool_id, :user_id)
end
# def booking_params
# params.require(:booking).permit()
# end


end

3 changes: 3 additions & 0 deletions app/views/bookings/_form.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<%= simple_form_for [@tool, @booking], defaults: { input_html: { class: 'form-control form-inline' } } do |f| %>
<%= f.submit 'Book tool', class: 'btn btn-primary' %>
<% end %>
5 changes: 5 additions & 0 deletions app/views/bookings/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
<h1>Bookings#edit</h1>
<p>Find me in app/views/bookings/edit.html.erb</p>
<div class="container">
<div class="form-group text-center">
<%= render 'form' %>
</div>
</div>
5 changes: 5 additions & 0 deletions app/views/bookings/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
<h1>Bookings#new</h1>
<p>Find me in app/views/bookings/new.html.erb</p>

<div class="form-group">
<%= render 'form' %>
</div>

20 changes: 20 additions & 0 deletions app/views/bookings/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,22 @@
<h1>Bookings#show</h1>
<p>Find me in app/views/bookings/show.html.erb</p>

<div class="container">
<div class="row">
<div class="col-sm-4">
<div class="thumbnail">
<%= cl_image_tag @booking.tool.photo, height: 250, crop: :fill %>
<div class="caption text-center">
<h3>Tool: <%= @booking.tool.name %></h3>
<p>Owner: <%= @booking.tool.owner.email %></p>
<p>Created at: <%= @booking.created_at %></p>
<br><br>
<%= link_to 'Return to index', tools_path, class: 'btn btn-danger' %>
</div>
</div>
</div>
</div>
</div>

<%= current_user.id %>
<%= @booking.tool.owner.id %>
2 changes: 1 addition & 1 deletion app/views/tools/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<% if @tool.owner == current_user %>
<%= link_to 'Edit', edit_tool_path, class: 'btn btn-warning' %></p>
<% else %>
<%= link_to 'Book me', new_booking_path, class: 'btn btn-success' %>
<%= link_to 'Book me', new_tool_booking_path(@tool), class: 'btn btn-success' %>
<% end %>
<br><br>
<%= link_to 'Return to index', tools_path, class: 'btn btn-danger' %>
Expand Down
7 changes: 4 additions & 3 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

root to: 'pages#homepage'
get 'my_tools', to: 'tools#mine'
resources :tools
resources :tools do
resources :bookings, only: [:new, :create]
end
devise_for :users,
controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }

resources :bookings

resources :bookings, only: [:show]
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end