summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-03-02 16:37:22 -0500
committerTomer Kimia <tkimia@purdue.edu>2014-03-02 16:37:22 -0500
commit8f0fcea67d457ec232edfc30d8a4de7355a0c530 (patch)
tree5db221a82ea315d202018c2b37c851ab2965bd20 /app/controllers
parentef3f0fa6ea34f3c9fbbc67ac14abed983838d281 (diff)
parent7d84062ebe272855c0e6ebbfd991ab277fdc079f (diff)
app html still here
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb4
-rw-r--r--app/controllers/users_controller.rb3
2 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d83690e..03ef797 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,8 @@ class ApplicationController < ActionController::Base
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
+
+ #include sessionhelper for the session controller and view
+ include SessionHelper
+
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ebcc3ac..f4e1499 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,4 +3,7 @@ class UsersController < ApplicationController
def new
end
+ def show
+ @user = User.find(param[:id])
+ end
end