Merge branch 'master' of github.com:openHPI/codeocean-classroom into refactor

Author: Theresa

app/controllers/exercises_controller.rb

@@ -83,8 +83,12 @@ def add_to_cart
       Cart.create(user: current_user)
     end
     cart = Cart.find_by(user: current_user)
-    cart.exercises << @exercise
-    redirect_to @exercise, notice: 'Exercise was successfully added to your cart.'
+    unless cart.exercises.find_by(id: @exercise.id)
+      cart.exercises << @exercise
+      redirect_to @exercise, notice: 'Exercise was successfully added to your cart.'
+    else
+      redirect_to @exercise, alert: 'Exercise already in your cart.'
+    end
   end
 
   def exercises_all

app/models/ability.rb

@@ -12,7 +12,7 @@ def initialize(user)
         can :export, Exercise
         can :add_to_cart, Exercise
         can :read, Exercise
-        can :edit, Exercise do |exercise|
+        can :manage, Exercise do |exercise|
           exercise.user == user
         end
 

app/views/exercises/show.html.erb

@@ -28,8 +28,8 @@
 <dl class="dl-horizontal">
 
     <dt><em><%= 'Files' %>:</em> </dt>
+    <br>
     <% @files.each do |file| %>
-      <br>
       <dd>
         <dt><%= 'Content: '%></dt>
         <dd><div class="editor_readonly"><%= file.content %></div></dd>
@@ -47,8 +47,8 @@
 </dl>
 <dl class="dl-horizontal">
     <dt><em><%= 'Tests' %>:</em> </dt>
+    <br>
     <% @tests.each do |test| %>
-      <br>
       <dd>
         <dt><%= 'Content: '%></dt>
         <dd><div class="editor_readonly"><%= test.content %></div></dd>