Merge branch 'master' of https://github.com/openHPI/codeharbor

Author: marcelja

app/views/carts/index.html.erb

@@ -1,6 +1,6 @@
 <p id="notice"><%= notice %></p>
 
-<h2>Your Cart <%= link_to 'New Cart', new_cart_path, class:'btn  btn-success' %></h2>
+<h2>Your Cart </h2>
 
 
 <dl class="dl-horizontal">
@@ -9,7 +9,9 @@
       <% if cart.user === current_user %>
         <% if cart.exercises %>
           <% cart.exercises.each do |exercise| %>
-            <dd><%= link_to exercise.title, exercise_path(exercise) %></dd>
+            <% if exercise %>
+              <dd><%= link_to exercise.title, exercise_path(exercise) %></dd>
+            <% end %>
           <% end %>
         <% else%>
           <dd> <%= 'No exercises added' %></dd>

app/views/collections/index.html.erb

@@ -18,7 +18,9 @@
           <td><%= collection.title %></td>
           <% if collection.exercises %>
             <% collection.exercises.each do |exercise| %>
-              <td><%= link_to exercise.title, exercise_path(exercise) %></td>
+              <%if exercise%>
+                <td><%= link_to exercise.title, exercise_path(exercise) %></td>
+              <% end %>
             <% end %>
           <% else%>
             <td> <%= 'No exercises added' %></td>