Skip to content

Commit 3066811

Browse files
author
Theresa
committed
fix carts
1 parent 0ed771a commit 3066811

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

app/controllers/carts_controller.rb

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ def edit
2424
# POST /carts
2525
# POST /carts.json
2626
def create
27-
@cart = Cart.new(cart_params)
27+
@cart = Cart.new
28+
@cart.user = current_user
2829

2930
respond_to do |format|
3031
if @cart.save
@@ -41,13 +42,8 @@ def create
4142
# PATCH/PUT /carts/1.json
4243
def update
4344
respond_to do |format|
44-
if @cart.update(cart_params)
45-
format.html { redirect_to @cart, notice: 'Cart was successfully updated.' }
46-
format.json { render :show, status: :ok, location: @cart }
47-
else
48-
format.html { render :edit }
49-
format.json { render json: @cart.errors, status: :unprocessable_entity }
50-
end
45+
format.html { render :edit }
46+
format.json { render json: @cart.errors, status: :unprocessable_entity }
5147
end
5248
end
5349

@@ -68,7 +64,4 @@ def set_cart
6864
end
6965

7066
# Never trust parameters from the scary internet, only allow the white list through.
71-
def cart_params
72-
params.require(:cart).permit(:user_id)
73-
end
7467
end

app/views/carts/_form.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<% end %>
1313

1414
<% if @cart.persisted?%>
15-
<dl class="dl-horizontal">
15+
<dl class="dl-horizontal col-md-12">
1616
<dt>Exercises</dt>
1717
<% if @cart.user === current_user %>
1818
<% if @cart.exercises %>
1919
<% @cart.exercises.each do |exercise| %>
2020
<dd><%= link_to exercise.title, exercise_path(exercise) %></dd>
21-
<dd><%= link_to 'Delete', nil, class:'btn btn-danger btn-xs' %></dd>
21+
<dd><%= link_to 'Delete', @cart.exercises.delete(exercise), method: :delete, data: { confirm: 'Are you sure?' }, class:'btn btn-danger btn-xs' %></dd>
2222
<% end %>
2323
<% else%>
2424
<dd> <%= 'No exercises added' %></dd>

0 commit comments

Comments
 (0)