Skip to content
Browse files

Merge pull request #6 from rianrainey/fixes/5

Prelaunch fixes
  • Loading branch information...
2 parents 0d806ef + e3f7048 commit 5a2096141df7f994686d682029aabbdadb467ff7 rianrainey committed Mar 31, 2013
View
5 app/controllers/users_controller.rb
@@ -3,10 +3,7 @@ class UsersController < ApplicationController
# GET /users/1
# GET /users/1.json
def show
- #@user = User.find(params[:id])
- puts current_user.id
- puts params[:id]
- @user = User.find(1) #current_user
+ @user = User.find(current_user.id)
respond_to do |format|
format.html # show.html.erb
View
2 app/models/notifier.rb
@@ -1,5 +1,5 @@
class Notifier < ActionMailer::Base
- default :from => "crossfit@rianrainey.com"
+ default :from => "Crossfit West Nashville <crossfit@rian.me>"
# send a signup email to the user, pass in the user object that contains the user’s email address
def signup_email(user)
View
1 app/views/admin/roles/edit.html.erb
@@ -2,5 +2,4 @@
<%= render 'form' %>
-<%= link_to 'Show', @role %> |
<%= link_to 'Back', admin_roles_path %>
View
2 app/views/admin/workouts/index.html.erb
@@ -10,7 +10,7 @@
<% @workouts.each do |workout| %>
<tr>
<td><%= workout.title %></td>
- <td><%= workout.body %></td>
+ <td><%= workout.body.html_safe %></td>
<td>
<div class="btn-group">
<a href="#" class="btn dropdown-toggle" data-toggle="dropdown">Action<span class="caret"></span></a>
View
2 app/views/admin/workouts/show.html.erb
@@ -6,7 +6,7 @@
<p>
<b>Body:</b>
- <%= @workout.body %>
+ <%= @workout.body.html_safe %>
</p>
View
2 app/views/entries/new.html.erb
@@ -2,4 +2,4 @@
<%= render 'form' %>
-<%= link_to 'Back', workout_entries_path(2) %>
+<%= link_to 'Back', workout_entries_path(params[:workout_id]) %>
View
1 app/views/users/show.html.erb
@@ -14,6 +14,5 @@
<%= @user.email %>
</p>
-
<%= link_to 'Edit', edit_user_path(@user) %> |
<%= link_to 'Back', user_path %>

0 comments on commit 5a20961

Please sign in to comment.
Something went wrong with that request. Please try again.