Merge pull request #8 from rianrainey/fixes/5

Fixing html_safe output.
rianrainey · Apr 1, 2013 · 15f05a9 · 15f05a9
2 parents 0e52bfc + 7b0de81
commit 15f05a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/admin/workouts_controller.rb b/app/controllers/admin/workouts_controller.rb
@@ -62,10 +62,10 @@ def create
   # PUT /workouts/1.json
   def update
     @workout = Workout.find(params[:id])
-
+binding.pry
     respond_to do |format|
       if @workout.update_attributes(params[:workout])
-        format.html { redirect_to @workout, notice: 'Workout was successfully updated.' }
+        format.html { redirect_to workouts_path, notice: 'Workout was successfully updated.' }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }

diff --git a/app/views/entries/index.html.erb b/app/views/entries/index.html.erb
@@ -13,7 +13,7 @@
 <% @entries.each do |entry| %>
   <tr>
     <td><%= entry.date_performed.strftime("%m/%d/%y") %></td>
-    <td><%= entry.body %></td>
+    <td><%= entry.body.html_safe %></td>
     <td><%= entry.rounds %></td>
     <td><%= entry.repetitions %></td>
     <td><%= entry.time %></td>

diff --git a/app/views/workouts/individual_workouts.html.erb b/app/views/workouts/individual_workouts.html.erb
@@ -10,7 +10,7 @@
   <tr>
     <% if @workout %>
     <td><%= @workout.title %></td>
-    <td><%= @workout.body %></td>
+    <td><%= @workout.body.html_safe %></td>
     <td>
       <% if user_signed_in? %>
         <ul class="inline">