corntrace-nifty-generators 0.4.0 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/generators/nifty/authentication/templates/authentication.rb +5 -1
  2. data/rails_generators/nifty_authentication/templates/authentication.rb +6 -2
  3. metadata +3 -3
data/lib/generators/nifty/authentication/templates/authentication.rb CHANGED
@@ -48,7 +48,11 @@ module Authentication
48
48
  end
49
49
 
50
50
  def redirect_to_target_or_default(default)
51
- redirect_to(session[:return_to] || default)
51
+ if session[:redirect_to].blank? or session[:redirect_to] == logout_path
52
+ redirect_to default
53
+ else
54
+ redirect_to session[:redirect_to]
55
+ end
52
56
  session[:return_to] = nil
53
57
  end
54
58
 
data/rails_generators/nifty_authentication/templates/authentication.rb CHANGED
@@ -49,8 +49,12 @@ module Authentication
49
49
  end
50
50
 
51
51
  def redirect_to_target_or_default(default)
52
- redirect_to(session[:return_to] || default)
53
- session[:return_to] = nil
52
+ if session[:redirect_to].blank? or session[:redirect_to] == logout_path
53
+ redirect_to default
54
+ else
55
+ redirect_to session[:redirect_to]
56
+ end
57
+ session[:return_to] = nil
54
58
  end
55
59
 
56
60
  private
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 4
8
- - 0
9
- version: 0.4.0
8
+ - 1
9
+ version: 0.4.1
10
10
  platform: ruby
11
11
  authors:
12
12
  - Kevin Fu
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-05-09 00:00:00 +08:00
17
+ date: 2010-05-13 00:00:00 +08:00
18
18
  default_executable:
19
19
  dependencies: []
20
20