jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2014-11-24 14:39:51 +08:00
parent feccad8fa5 d7d49d2fbd
commit d9a7e2181c
2 changed files with 1110 additions and 1113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@ -364,10 +364,10 @@ class User < Principal
end
end
end
if user && !user.new_record?
unless user.nil?
last_login_on = user.last_login_on.nil? ? '' : user.last_login_on.to_s
user.update_column(:last_login_on, Time.now)
end
user.update_column(:last_login_on, Time.now) if user && !user.new_record?
[user, last_login_on]
rescue => text
raise text

5
app/views/account/login.html.erb
View File

@ -20,10 +20,7 @@
}
}
</script>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=9">
<meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
</head>
<div id="login-form">
<%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag %>