diff options
| author | mo <mokha@cisco.com> | 2017-08-31 14:55:11 -0600 |
|---|---|---|
| committer | mo <mokha@cisco.com> | 2017-08-31 14:55:11 -0600 |
| commit | 29226203fe7cc1c5fddd49a5017e1719f2cf17ce (patch) | |
| tree | 8dda0d99d44f6668c20736b4a4afab18c6dd0cdb /app/controllers | |
| parent | 31b7af8b613c942af36b411de5b30d4f720d177d (diff) | |
upgrade
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/cakes_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/sessions_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/cakes_controller.rb b/app/controllers/cakes_controller.rb index 8e3a79a1..9d4a5ef1 100644 --- a/app/controllers/cakes_controller.rb +++ b/app/controllers/cakes_controller.rb @@ -13,6 +13,6 @@ class CakesController < ApplicationController def show @creation = Creation.find(params[:id]) - @primary_image = params[:photo_id].present? ? @creation.photos.find(params[:photo_id]) : @creation.primary_image + @primary_image = params[:photo_id].present? ? @creation.photos.find(params[:photo_id]) : @creation.primary_image end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 99d51797..76572592 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -6,6 +6,7 @@ class SessionsController < ApplicationController def create if @session = User.login(session_params[:username], session_params[:password]) + reset_session session[:raphael] = @session.access(request) redirect_to my_dashboard_path else |