omniauth-scaffold 0.1.26 → 0.1.27
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.
- data/lib/omniauth-scaffold/templates/_user_icon.html.erb +3 -1
- data/lib/omniauth-scaffold/templates/application_controller.rb +1 -4
- data/lib/omniauth-scaffold/templates/sessions_controller.rb +0 -2
- data/lib/omniauth-scaffold/templates/top_controller.rb +0 -2
- data/lib/omniauth-scaffold/version.rb +1 -1
- metadata +2 -2
|
@@ -1 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
<% if user.present? %>
|
|
2
|
+
<%= link_to_unless( user.nickname.blank?, image_tag( user.image, size: "18x18", class: "margin_minus2" ), "#{Settings.provider_page}#{user.nickname}", target: "_blank", rel: "tooltip", "data-original-title" => user.nickname ) %>
|
|
3
|
+
<% end %>
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
# coding: utf-8
|
|
2
2
|
class ApplicationController < ActionController::Base
|
|
3
|
-
|
|
4
3
|
protect_from_forgery
|
|
5
4
|
|
|
6
5
|
# ログイン認証
|
|
@@ -40,9 +39,7 @@ class ApplicationController < ActionController::Base
|
|
|
40
39
|
# current_user #
|
|
41
40
|
#--------------#
|
|
42
41
|
def current_user
|
|
43
|
-
@current_user ||= User.where( id: session[:user_id] ).first
|
|
42
|
+
@current_user ||= (User.where( id: session[:user_id] ).first || User.new)
|
|
44
43
|
end
|
|
45
|
-
|
|
46
44
|
helper_method :current_user
|
|
47
|
-
|
|
48
45
|
end
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
# coding: utf-8
|
|
2
2
|
class SessionsController < ApplicationController
|
|
3
|
-
|
|
4
3
|
#----------#
|
|
5
4
|
# callback #
|
|
6
5
|
#----------#
|
|
@@ -34,5 +33,4 @@ class SessionsController < ApplicationController
|
|
|
34
33
|
def failure
|
|
35
34
|
render text: "<span style='color: red;'>Auth Failure</span>"
|
|
36
35
|
end
|
|
37
|
-
|
|
38
36
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: omniauth-scaffold
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.27
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date:
|
|
12
|
+
date: 2013-01-07 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails_config
|