Better implementation of redirecting to stored URI - committed to nif…

…ty_generators plugin as well

app/controllers/application_controller.rb

@@ -20,9 +20,4 @@ def admin?
   end
   helper_method :admin?
 
-  def redirect_back_or_default(default)
-    redirect_to(session[:return_to] || default)
-    session[:return_to] = nil
-  end
-
 end

app/controllers/sessions_controller.rb

@@ -11,7 +11,7 @@ def create
     subscriber = Subscriber.authenticate(params[:login], params[:password])
     if subscriber
       session[:subscriber_id] = subscriber.id
-      redirect_back_or_default('/')
+      redirect_to_target_or_default(root_url)
     else
       flash.now[:warning] = "Invalid login or password."
       render :action => 'new'

lib/authentication.rb

@@ -13,15 +13,20 @@ def logged_in?
 
   def login_required
     unless logged_in?
-      flash[:notice] = "You need to login or create an account to continue."
-      store_location
+      flash[:error] = "You must first log in or sign up before accessing this page."
+      store_target_location
       redirect_to login_url
     end
   end
 
+  def redirect_to_target_or_default(default)
+    redirect_to(session[:return_to] || default)
+    session[:return_to] = nil
+  end
+
   private
 
-  def store_location
+  def store_target_location
     session[:return_to] = request.request_uri
   end
 end

tmp/.gitignore

@@ -0,0 +1 @@
+restart.txt