From 7dd60d3d0cf8ee1048166f3b1c19533b49455f19 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Wed, 21 Jun 2006 06:40:54 +0000
Subject: [PATCH] Better handling of returning users: don't display the login
page.
---
app/controllers/users_controller.rb | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a1a495c..eca3258 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -53,7 +53,18 @@ class UsersController < ApplicationController
@user_pages, @users = paginate :users, :per_page => 10
if params[:id].nil?
- @hide_logout = true
+ if cookies[:user_id].nil?
+ @hide_logout = true
+ else
+ user = User.find(cookies[:user_id])
+ if user.nil?
+ flash.now[:notice] = "User id " + params[:id] + " not found"
+ @hide_logout = true
+ else
+ flash[:notice] = "Welcome back, " + user.username
+ redirect_to :controller => "recordings", :action => "list_owned"
+ end
+ end
return
end
--
GitLab