From 83a077d8fe790418cb53e63fbf373235637bd76d Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 4 Apr 2011 01:31:27 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E6=AD=A3=E5=BC=80=E6=94=BE?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=90=8E=EF=BC=8C=E4=B8=89=E6=96=B9=E5=B8=90?= =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E9=99=86=E9=94=99=E6=97=A0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= =?UTF-8?q?=20Mod:=20Timeline=20=E4=B8=80=E4=BA=9B=E5=B0=8F=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=8A=8A=E5=AD=97=E4=BD=93=E6=94=B9=E5=B0=8F=EF=BC=9B?= =?UTF-8?q?=20Add:=20=E5=8A=A0=E5=85=A5=20Github=E5=B8=90=E5=8F=B7=20?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 14 ++++++++++---- app/models/user.rb | 13 ++++++++++--- app/views/logs/_log.html.erb | 6 +++--- app/views/shared/_omniauth_links.html.erb | 6 ++++++ config/initializers/omniauth.rb | 1 + public/images/favicons.png | Bin 4895 -> 5276 bytes public/stylesheets/front.css | 2 ++ 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9cf940f..5cd3120 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -68,10 +68,11 @@ def unfollow def auth_callback auth = request.env["omniauth.auth"] redirect_to root_path if auth.blank? + provider_name = auth['provider'].gsub(/^t/,"").titleize if current_user Authorization.create_from_hash(auth, current_user) - flash[:notice] = "成功绑定了 #{auth['provider']} 帐号。" + flash[:notice] = "成功绑定了 #{provider_name} 帐号。" redirect_to edit_user_registration_path elsif @user = Authorization.find_from_hash(auth) sign_in @user @@ -80,9 +81,14 @@ def auth_callback else if Setting.allow_register @new_user = Authorization.create_from_hash(auth, current_user) #Create a new user - sign_in @new_user - flash[:notice] = "欢迎来自 #{auth['provider']} 的用户，你的帐号已经创建成功。" - redirect_to "/" + if @new_user.errors.blank? + sign_in @new_user + flash[:notice] = "欢迎来自 #{provider_name} 的用户，你的帐号已经创建成功。" + redirect_to "/" + else + flash[:notice] = "#{provider_name}的帐号提供信息不全，无法直接登陆，请先注册。" + redirect_to "/register" + end else flash[:alert] = "你还没有注册用户。" redirect_back_or_default "/login" diff --git a/app/models/user.rb b/app/models/user.rb index 865477f..0fb6a20 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -55,10 +55,15 @@ def password_required? mount_uploader :avatar, AvatarUploader def self.create_from_hash(auth) + Rails.logger.debug { "---------#{auth}"} user = User.new user.name = auth["user_info"]["name"] user.email = auth['user_info']['email'] - user.save(false) + if user.email.blank? + user.errors.add("Email","三方网站没有提供你的Email信息，无法直接注册。") + return user + end + user.save user.reset_persistence_token! #set persistence_token else sessions will not be created user end @@ -67,8 +72,10 @@ def self.create_from_hash(auth) # 此方法用于处理开始注册是自动生成 slug, 因为没表单,只能自动 def auto_slug if self.slug.blank? - self.slug = self.email.split("@")[0] - self.slug = self.slug.safe_slug + if !self.email.blank? + self.slug = self.email.split("@")[0] + self.slug = self.slug.safe_slug + end # 如果 slug 被 safe_slug 后是空的,就用 id 代替 if self.slug.blank? self.slug = self.id.to_s diff --git a/app/views/logs/_log.html.erb b/app/views/logs/_log.html.erb index 7f23e87..6436009 100644 --- a/app/views/logs/_log.html.erb +++ b/app/views/logs/_log.html.erb @@ -69,9 +69,9 @@ when "UserLog" %>
<% if ["FOLLOW_TOPIC", "UNFOLLOW_TOPIC"].include?(action) %> -
<%= user_name_tag(log.user) %> <%= action == "FOLLOW_TOPIC" ? "关注" : "取消关注" %>了话题 #<%= item.name %>
+
<%= user_name_tag(log.user) %> <%= action == "FOLLOW_TOPIC" ? "关注" : "取消关注" %>了话题 #<%= item.name %>
<% elsif ["FOLLOW_USER", "UNFOLLOW_USER"].include?(action) %> -
<%= user_name_tag(log.user) %> <%= action == "FOLLOW_USER" ? "关注" : "取消关注" %>了 <%= user_name_tag(item) %>
+
<%= user_name_tag(log.user) %> <%= action == "FOLLOW_USER" ? "关注" : "取消关注" %>了 <%= user_name_tag(item) %>
<% else %>
<%= item.title %>
@@ -146,7 +146,7 @@ when "TopicLog" if !item.nil? %>
-
<%= user_name_tag(log.user) %> 创建了话题 #<%= item.name %>
+
<%= user_name_tag(log.user) %> 创建了话题 #<%= item.name %>
<% end diff --git a/app/views/shared/_omniauth_links.html.erb b/app/views/shared/_omniauth_links.html.erb index d79d940..5757809 100644 --- a/app/views/shared/_omniauth_links.html.erb +++ b/app/views/shared/_omniauth_links.html.erb @@ -3,6 +3,7 @@ <% if not current_user %>
  • Google帐号
    • +
  • Github
  • 豆瓣
  • QQ帐号(腾讯微博)
  • 新浪微博
    • @@ -16,6 +17,11 @@ <% else %>
  • Google帐号[已绑定]
    • <% end %> + <% if not current_user.auths.index("github") %> +
  • Github
    • + <% else %> +
  • Github[已绑定]
    • + <% end %> <% if not current_user.auths.index("douban") %>
  • 豆瓣
    • <% else %> diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 65b61ae..f389070 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -6,4 +6,5 @@ provider :tqq, 'd474e02630a849a5bbbf13bca0f9795f', '279bad9e954cc2b3f9988df534b4be49' provider :t163, 'BMO70rvqyCs0Pby5', 'AwRwtzF1eRPVrZa5rzusedS8JdM79pNj' provider :tsohu, 'XtA4sAn6dpVnqIMNucge', 'URzg4g)Vj9M(9VdMarXIZddgQ8!(5m8cehkH^WB0' + provider :github, '11f1ad7b2ef9263b2ead', '4f07422d1e499126e2fb247dd547b670e01a47d1' end diff --git a/public/images/favicons.png b/public/images/favicons.png index 258b7c34a41c74ea51c8dc6117ae064fd388f214..5885444299048138e966215523bd91b2011e7306 100644 GIT binary patch delta 5251 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 diff --git a/public/stylesheets/front.css b/public/stylesheets/front.css index 7f48604..a139878 100644 --- a/public/stylesheets/front.css +++ b/public/stylesheets/front.css @@ -92,6 +92,7 @@ address, blockquote { .ask a.topic:hover { background:#19558D; color:#FFF; } .ask .title { font-size: 1.3em; line-height: 1.2em; margin: 2px 0 5px; } +.ask .small_title { font-size:12px; margin:0px; color:#999; } .ask .title h1 { font-size: 1.2em; line-height: 1.2em; display:inline; } .ask .info { color: #999; margin:3px 0; } .ask .last_answer { margin-top:5px; } @@ -299,6 +300,7 @@ a.user img.normal { width:100px; height:100px; } #omniauth_links li.t163 a { background-position:0 -80px; } #omniauth_links li.tsohu a { background-position:0 -96px; } #omniauth_links li.google a { background-position:0 -48px; } +#omniauth_links li.github a { background-position:0 -113px; } #omniauth_links li span { color:#999; margin-left:3px; } .search_result_dropdown {}